From a7ae8df4a1611a18203bc29783e7fbaaf957fd54 Mon Sep 17 00:00:00 2001 From: Daniel Hokka Zakrisson Date: Sun, 27 Feb 2011 02:27:45 +0100 Subject: fix pointer argument --- signature-log.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'signature-log.c') diff --git a/signature-log.c b/signature-log.c index 5b7b306..85617f1 100644 --- a/signature-log.c +++ b/signature-log.c @@ -128,7 +128,7 @@ int backend_handle_mail(struct mailbox_transaction_context *t, ast->dict_ctx = dict_transaction_begin(ast->dict); signature = t_strconcat("priv/", signature, NULL); dict_atomic_inc(ast->dict_ctx, signature, inc); - ret = dict_transaction_commit(ast->dict_ctx); + ret = dict_transaction_commit(&ast->dict_ctx); if (ret) mail_storage_set_error(t->box->storage, ME(NOTPOSSIBLE) -- cgit v1.2.3 From 57cfc0aac9f8cc5d00fa1155367dfd055da27761 Mon Sep 17 00:00:00 2001 From: Daniel Hokka Zakrisson Date: Sun, 27 Feb 2011 01:49:00 +0100 Subject: make backend selection at runtime --- signature-log.c | 25 +++++++++++++++++-------- 1 file changed, 17 insertions(+), 8 deletions(-) (limited to 'signature-log.c') diff --git a/signature-log.c b/signature-log.c index 85617f1..1cfc956 100644 --- a/signature-log.c +++ b/signature-log.c @@ -44,7 +44,7 @@ struct antispam_transaction_context { struct dict_transaction_context *dict_ctx; }; -struct antispam_transaction_context * +static struct antispam_transaction_context * backend_start(struct mailbox *box __attr_unused__) { struct antispam_transaction_context *ast; @@ -59,7 +59,7 @@ 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) { if (ast->dict) { // dict_transaction_rollback(ast->dict_ctx); @@ -69,7 +69,7 @@ void backend_rollback(struct antispam_transaction_context *ast) i_free(ast); } -int backend_commit(struct mailbox_transaction_context *ctx __attr_unused__, +static int backend_commit(struct mailbox_transaction_context *ctx __attr_unused__, struct antispam_transaction_context *ast) { int ret = 0; @@ -84,9 +84,9 @@ int backend_commit(struct mailbox_transaction_context *ctx __attr_unused__, return ret; } -int backend_handle_mail(struct mailbox_transaction_context *t, - struct antispam_transaction_context *ast, - struct mail *mail, enum classification wanted) +static int backend_handle_mail(struct mailbox_transaction_context *t, + struct antispam_transaction_context *ast, + struct mail *mail, enum classification wanted) { const char *signature; int ret; @@ -137,7 +137,7 @@ int backend_handle_mail(struct mailbox_transaction_context *t, return ret; } -void backend_init(pool_t pool __attr_unused__) +static void backend_init(pool_t pool __attr_unused__) { const char *tmp; @@ -156,6 +156,15 @@ void backend_init(pool_t pool __attr_unused__) signature_init(); } -void backend_exit(void) +static void backend_exit(void) { } + +struct backend antispam_backend = { + .init = backend_init, + .exit = backend_exit, + .handle_mail = backend_handle_mail, + .start = backend_start, + .rollback = backend_rollback, + .commit = backend_commit, +}; -- cgit v1.2.3 From ca91e1366a57ff45597168592781cdaf35af48a0 Mon Sep 17 00:00:00 2001 From: Johannes Berg Date: Sun, 27 Feb 2011 11:09:49 +0100 Subject: add an API version to the backend struct Just to make sure nobody loads a backend plugin that isn't suitable for the version of antispam itself. --- signature-log.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'signature-log.c') diff --git a/signature-log.c b/signature-log.c index 1cfc956..d0ab332 100644 --- a/signature-log.c +++ b/signature-log.c @@ -161,10 +161,11 @@ static void backend_exit(void) } struct backend antispam_backend = { - .init = backend_init, - .exit = backend_exit, - .handle_mail = backend_handle_mail, - .start = backend_start, - .rollback = backend_rollback, - .commit = backend_commit, + .api_version = BACKEND_API_VERSION, + .init = backend_init, + .exit = backend_exit, + .handle_mail = backend_handle_mail, + .start = backend_start, + .rollback = backend_rollback, + .commit = backend_commit, }; -- cgit v1.2.3 From 7a13a04dc0ef562e53097f614e887285965d4659 Mon Sep 17 00:00:00 2001 From: Johannes Berg Date: Sun, 27 Feb 2011 15:40:03 +0100 Subject: build in all backend plugins --- signature-log.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'signature-log.c') diff --git a/signature-log.c b/signature-log.c index d0ab332..7a9b422 100644 --- a/signature-log.c +++ b/signature-log.c @@ -160,8 +160,7 @@ static void backend_exit(void) { } -struct backend antispam_backend = { - .api_version = BACKEND_API_VERSION, +struct backend signature_backend = { .init = backend_init, .exit = backend_exit, .handle_mail = backend_handle_mail, -- cgit v1.2.3