lib-sieve: imap4flags extension: Added API for runtime initialization…

… of derived extensions. This is needed to register the implicit side effect for the internal flag variable.
dovecot · Sep 7, 2017 · e5ea21f · e5ea21f
1 parent 736f94e
commit e5ea21f
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 14 deletions.
diff --git a/src/lib-sieve/plugins/imap4flags/ext-imap4flags-common.h b/src/lib-sieve/plugins/imap4flags/ext-imap4flags-common.h
@@ -11,14 +11,6 @@
 
 #include "sieve-ext-imap4flags.h"
 
-/*
- * Extension
- */
-
-extern const struct sieve_extension_def imap4flags_extension;
-extern const struct sieve_interpreter_extension
-	imap4flags_interpreter_extension;
-
 /*
  * Side effect
  */

diff --git a/src/lib-sieve/plugins/imap4flags/ext-imap4flags.c b/src/lib-sieve/plugins/imap4flags/ext-imap4flags.c
@@ -76,13 +76,18 @@ static bool ext_imap4flags_validator_load
 	return TRUE;
 }
 
-static bool ext_imap4flags_interpreter_load
-(const struct sieve_extension *ext, const struct sieve_runtime_env *renv,
-	sieve_size_t *address ATTR_UNUSED)
+void sieve_ext_imap4flags_interpreter_load
+(const struct sieve_extension *ext, const struct sieve_runtime_env *renv)
 {
 	sieve_interpreter_extension_register
 		(renv->interp, ext, &imap4flags_interpreter_extension, NULL);
+}
 
+static bool ext_imap4flags_interpreter_load
+(const struct sieve_extension *ext, const struct sieve_runtime_env *renv,
+	sieve_size_t *address ATTR_UNUSED)
+{
+	sieve_ext_imap4flags_interpreter_load(ext, renv);
 	return TRUE;
 }
 

diff --git a/src/lib-sieve/plugins/imap4flags/ext-imapflags.c b/src/lib-sieve/plugins/imap4flags/ext-imapflags.c
@@ -186,9 +186,7 @@ static bool ext_imapflags_interpreter_load
 	const struct sieve_extension *master_ext =
 		(const struct sieve_extension *) ext->context;
 
-	sieve_interpreter_extension_register
-		(renv->interp, master_ext, &imap4flags_interpreter_extension, NULL);
-
+	sieve_ext_imap4flags_interpreter_load(master_ext, renv);
 	return TRUE;
 }
 

diff --git a/src/lib-sieve/plugins/imap4flags/sieve-ext-imap4flags.h b/src/lib-sieve/plugins/imap4flags/sieve-ext-imap4flags.h
@@ -13,6 +13,8 @@ struct sieve_variable_storage;
 /* FIXME: this is not suitable for future plugin support */
 
 extern const struct sieve_extension_def imap4flags_extension;
+extern const struct sieve_interpreter_extension
+	imap4flags_interpreter_extension;
 
 static inline const struct sieve_extension *
 sieve_ext_imap4flags_require_extension
@@ -22,6 +24,10 @@ sieve_ext_imap4flags_require_extension
 		(svinst, &imap4flags_extension, TRUE);
 }
 
+void sieve_ext_imap4flags_interpreter_load
+(const struct sieve_extension *ext,
+	const struct sieve_runtime_env *renv);
+
 /*
  * Action side-effect
  */