From 71197d41f73e1a462dadd86dc6b841eb6cd30567 Mon Sep 17 00:00:00 2001
From: Stephan Bosch <stephan@rename-it.nl>
Date: Fri, 7 Aug 2009 23:57:52 +0200
Subject: [PATCH] Fixed compile warnings introduced by porting from v1.2.
---
src/lib-sieve/cmd-redirect.c | 1 +
src/lib-sieve/plugins/mailbox/tag-mailbox-create.c | 3 ++-
src/lib-sieve/plugins/notify/cmd-notify.c | 1 -
src/lib-sieve/sieve-actions.c | 10 ----------
src/lib-sieve/sieve-actions.h | 3 +++
5 files changed, 6 insertions(+), 12 deletions(-)
diff --git a/src/lib-sieve/cmd-redirect.c b/src/lib-sieve/cmd-redirect.c
index 6fe209c82..996b90459 100644
--- a/src/lib-sieve/cmd-redirect.c
+++ b/src/lib-sieve/cmd-redirect.c
@@ -22,6 +22,7 @@
#include "sieve-code-dumper.h"
#include "sieve-result.h"
#include "sieve-smtp.h"
+#include "sieve-message.h"
#include <stdio.h>
diff --git a/src/lib-sieve/plugins/mailbox/tag-mailbox-create.c b/src/lib-sieve/plugins/mailbox/tag-mailbox-create.c
index 228c0044c..f2bb4622b 100644
--- a/src/lib-sieve/plugins/mailbox/tag-mailbox-create.c
+++ b/src/lib-sieve/plugins/mailbox/tag-mailbox-create.c
@@ -7,6 +7,7 @@
#include "sieve-common.h"
#include "sieve-commands.h"
+#include "sieve-actions.h"
#include "sieve-code.h"
#include "sieve-actions.h"
#include "sieve-result.h"
@@ -115,7 +116,7 @@ static void seff_mailbox_create_print
static bool seff_mailbox_create_pre_execute
(const struct sieve_side_effect *seffect ATTR_UNUSED,
- const struct sieve_action *action,
+ const struct sieve_action *action ATTR_UNUSED,
const struct sieve_action_exec_env *aenv ATTR_UNUSED,
void **se_context ATTR_UNUSED, void *tr_context ATTR_UNUSED)
{
diff --git a/src/lib-sieve/plugins/notify/cmd-notify.c b/src/lib-sieve/plugins/notify/cmd-notify.c
index 39b7afa5f..90a84d583 100644
--- a/src/lib-sieve/plugins/notify/cmd-notify.c
+++ b/src/lib-sieve/plugins/notify/cmd-notify.c
@@ -787,7 +787,6 @@ static bool act_notify_send
(const struct sieve_action_exec_env *aenv,
const struct ext_notify_action *act)
{
- const struct sieve_message_data *msgdata = aenv->msgdata;
const struct sieve_script_env *senv = aenv->scriptenv;
const struct ext_notify_recipient *recipients;
void *smtp_handle;
diff --git a/src/lib-sieve/sieve-actions.c b/src/lib-sieve/sieve-actions.c
index cee98d669..7150366e1 100644
--- a/src/lib-sieve/sieve-actions.c
+++ b/src/lib-sieve/sieve-actions.c
@@ -236,16 +236,6 @@ static void act_store_print
/* Action implementation */
-static void act_store_get_storage_error
-(const struct sieve_action_exec_env *aenv, struct act_store_transaction *trans)
-{
- enum mail_error error;
- pool_t pool = sieve_result_pool(aenv->result);
-
- trans->error = p_strdup(pool,
- mail_storage_get_last_error(trans->namespace->storage, &error));
-}
-
static struct mailbox *act_store_mailbox_open
(const struct sieve_action_exec_env *aenv, const char **mailbox,
struct mail_namespace **ns_r, const char **folder_r)
diff --git a/src/lib-sieve/sieve-actions.h b/src/lib-sieve/sieve-actions.h
index e14a8a615..901e5050f 100644
--- a/src/lib-sieve/sieve-actions.h
+++ b/src/lib-sieve/sieve-actions.h
@@ -219,6 +219,9 @@ void sieve_act_store_add_flags
(const struct sieve_action_exec_env *aenv, void *tr_context,
const char *const *keywords, enum mail_flags flags);
+void sieve_act_store_get_storage_error
+ (const struct sieve_action_exec_env *aenv, struct act_store_transaction *trans);
+
/*
* Action utility functions
*/
--
GitLab