merge with base/masterHEADmaster

1 files changed, 17 insertions, 8 deletions

diff --git a/crm114-exec.c b/crm114-exec.c
index 7727409..ea0babc 100644
--- a/crm114-exec.c
+++ b/crm114-exec.c
@@ -129,7 +129,7 @@ struct antispam_transaction_context {
 	struct siglist *siglist;
 };
 
-struct antispam_transaction_context *
+static struct antispam_transaction_context *
 backend_start(struct mailbox *box __attr_unused__)
 {
 	struct antispam_transaction_context *ast;
@@ -139,13 +139,13 @@ backend_start(struct mailbox *box __attr_unused__)
 	return ast;
 }
 
-void backend_rollback(struct antispam_transaction_context *ast)
+static void backend_rollback(struct antispam_transaction_context *ast)
 {
 	signature_list_free(&ast->siglist);
 	i_free(ast);
 }
 
-int backend_commit(struct mailbox_transaction_context *ctx,
+static int backend_commit(struct mailbox_transaction_context *ctx,
 		   struct antispam_transaction_context *ast)
 {
 	struct siglist *item = ast->siglist;
@@ -167,14 +167,14 @@ int backend_commit(struct mailbox_transaction_context *ctx,
 	return ret;
 }
 
-int backend_handle_mail(struct mailbox_transaction_context *t,
-			struct antispam_transaction_context *ast,
-			struct mail *mail, enum classification want)
+static int backend_handle_mail(struct mailbox_transaction_context *t,
+			       struct antispam_transaction_context *ast,
+			       struct mail *mail, enum classification want)
 {
 	return signature_extract_to_list(t, mail, &ast->siglist, want);
 }
 
-void backend_init(pool_t pool)
+static void backend_init(pool_t pool)
 {
 	const char *tmp;
 	int i;
@@ -198,6 +198,15 @@ void backend_init(pool_t pool)
 	signature_init();
 }
 
-void backend_exit(void)
+static void backend_exit(void)
 {
 }
+
+struct backend crm114_backend = {
+	.init = backend_init,
+	.exit = backend_exit,
+	.handle_mail = backend_handle_mail,
+	.start = backend_start,
+	.rollback = backend_rollback,
+	.commit = backend_commit,
+};