diff --git a/src/lib-sieve/plugins/imap4flags/cmd-flag.c b/src/lib-sieve/plugins/imap4flags/cmd-flag.c
index 923ebcde70f15843bd6eedad7a03628d0a2d0b4a..b0187085c32c42450f9fe78a3d956ef5a0702958 100644
--- a/src/lib-sieve/plugins/imap4flags/cmd-flag.c
+++ b/src/lib-sieve/plugins/imap4flags/cmd-flag.c
@@ -90,7 +90,7 @@ static int cmd_flag_operation_execute
const struct sieve_operation setflag_operation = {
"SETFLAG",
- &imapflags_extension,
+ &imap4flags_extension,
ext_imap4flags_OPERATION_SETFLAG,
cmd_flag_operation_dump,
cmd_flag_operation_execute
@@ -100,7 +100,7 @@ const struct sieve_operation setflag_operation = {
const struct sieve_operation addflag_operation = {
"ADDFLAG",
- &imapflags_extension,
+ &imap4flags_extension,
ext_imap4flags_OPERATION_ADDFLAG,
cmd_flag_operation_dump,
cmd_flag_operation_execute
@@ -110,7 +110,7 @@ const struct sieve_operation addflag_operation = {
const struct sieve_operation removeflag_operation = {
"REMOVEFLAG",
- &imapflags_extension,
+ &imap4flags_extension,
ext_imap4flags_OPERATION_REMOVEFLAG,
cmd_flag_operation_dump,
cmd_flag_operation_execute
diff --git a/src/lib-sieve/plugins/imap4flags/ext-imap4flags-common.c b/src/lib-sieve/plugins/imap4flags/ext-imap4flags-common.c
index f8f0448e4e7d89aa5d13c601c0e9d8e5d161e168..239cde941c97511b45948b30789ff2a7cf71ccaf 100644
--- a/src/lib-sieve/plugins/imap4flags/ext-imap4flags-common.c
+++ b/src/lib-sieve/plugins/imap4flags/ext-imap4flags-common.c
@@ -172,7 +172,7 @@ static inline struct ext_imap4flags_result_context *_get_result_context
{
struct ext_imap4flags_result_context *rctx =
(struct ext_imap4flags_result_context *)
- sieve_result_extension_get_context(result, &imapflags_extension);
+ sieve_result_extension_get_context(result, &imap4flags_extension);
if ( rctx == NULL ) {
pool_t pool = sieve_result_pool(result);
@@ -181,7 +181,7 @@ static inline struct ext_imap4flags_result_context *_get_result_context
rctx->internal_flags = str_new(pool, 32);
sieve_result_extension_set_context
- (result, &imapflags_extension, rctx);
+ (result, &imap4flags_extension, rctx);
}
return rctx;
@@ -207,8 +207,8 @@ static void ext_imap4flags_runtime_init
(renv->result, &act_store, &flags_side_effect, NULL);
}
-const struct sieve_interpreter_extension imapflags_interpreter_extension = {
- &imapflags_extension,
+const struct sieve_interpreter_extension imap4flags_interpreter_extension = {
+ &imap4flags_extension,
ext_imap4flags_runtime_init,
NULL,
};
diff --git a/src/lib-sieve/plugins/imap4flags/ext-imap4flags-common.h b/src/lib-sieve/plugins/imap4flags/ext-imap4flags-common.h
index 5e3a304753deb93242224e00517e4b763330de85..53450169205455d2c5bdf1b861522d68317cdbe3 100644
--- a/src/lib-sieve/plugins/imap4flags/ext-imap4flags-common.h
+++ b/src/lib-sieve/plugins/imap4flags/ext-imap4flags-common.h
@@ -13,9 +13,9 @@
* Extension
*/
-extern const struct sieve_extension imapflags_extension;
+extern const struct sieve_extension imap4flags_extension;
extern const struct sieve_interpreter_extension
- imapflags_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
index 9e90ea1ad33daf767d553d90a995682d8fd6172a..3e60ebef74628741005845b164b5577531497989 100644
--- a/src/lib-sieve/plugins/imap4flags/ext-imap4flags.c
+++ b/src/lib-sieve/plugins/imap4flags/ext-imap4flags.c
@@ -31,7 +31,7 @@
* Operations
*/
-const struct sieve_operation *imapflags_operations[] = {
+const struct sieve_operation *imap4flags_operations[] = {
&setflag_operation,
&addflag_operation,
&removeflag_operation,
@@ -48,7 +48,7 @@ static bool ext_imap4flags_interpreter_load
int ext_imap4flags_my_id = -1;
-const struct sieve_extension imapflags_extension = {
+const struct sieve_extension imap4flags_extension = {
"imap4flags",
&ext_imap4flags_my_id,
NULL, NULL,
@@ -56,7 +56,7 @@ const struct sieve_extension imapflags_extension = {
NULL,
ext_imap4flags_interpreter_load,
NULL, NULL, NULL,
- SIEVE_EXT_DEFINE_OPERATIONS(imapflags_operations),
+ SIEVE_EXT_DEFINE_OPERATIONS(imap4flags_operations),
SIEVE_EXT_DEFINE_OPERAND(flags_side_effect_operand)
};
@@ -79,7 +79,7 @@ static bool ext_imap4flags_interpreter_load
(const struct sieve_runtime_env *renv, sieve_size_t *address ATTR_UNUSED)
{
sieve_interpreter_extension_register
- (renv->interp, &imapflags_interpreter_extension, NULL);
+ (renv->interp, &imap4flags_interpreter_extension, NULL);
return TRUE;
}
diff --git a/src/lib-sieve/plugins/imap4flags/tag-flags.c b/src/lib-sieve/plugins/imap4flags/tag-flags.c
index 14fc9eadc4b8895b6141ab07748d109162343916..bcd9d8195c53712b3e8dee497a5e7931a252d766 100644
--- a/src/lib-sieve/plugins/imap4flags/tag-flags.c
+++ b/src/lib-sieve/plugins/imap4flags/tag-flags.c
@@ -94,7 +94,7 @@ static const struct sieve_extension_objects ext_side_effects =
const struct sieve_operand flags_side_effect_operand = {
"flags operand",
- &imapflags_extension,
+ &imap4flags_extension,
0,
&sieve_side_effect_operand_class,
&ext_side_effects
diff --git a/src/lib-sieve/plugins/imap4flags/tst-hasflag.c b/src/lib-sieve/plugins/imap4flags/tst-hasflag.c
index 8326ba0c33e9ac707ab1e1e887e0b209ee9e04d1..127448a9370e7eecdb2870b86156412b5b97266a 100644
--- a/src/lib-sieve/plugins/imap4flags/tst-hasflag.c
+++ b/src/lib-sieve/plugins/imap4flags/tst-hasflag.c
@@ -56,7 +56,7 @@ static int tst_hasflag_operation_execute
const struct sieve_operation hasflag_operation = {
"HASFLAG",
- &imapflags_extension,
+ &imap4flags_extension,
ext_imap4flags_OPERATION_HASFLAG,
tst_hasflag_operation_dump,
tst_hasflag_operation_execute
diff --git a/src/lib-sieve/sieve-extensions.c b/src/lib-sieve/sieve-extensions.c
index 19a56ab551f25ea7f28676c2d38e14300f61764d..f58281e05d8b20007c26eeaf25f98af8616f0629 100644
--- a/src/lib-sieve/sieve-extensions.c
+++ b/src/lib-sieve/sieve-extensions.c
@@ -73,7 +73,7 @@ extern const struct sieve_extension subaddress_extension;
extern const struct sieve_extension comparator_i_ascii_numeric_extension;
extern const struct sieve_extension relational_extension;
extern const struct sieve_extension regex_extension;
-extern const struct sieve_extension imapflags_extension;
+extern const struct sieve_extension imap4flags_extension;
extern const struct sieve_extension copy_extension;
extern const struct sieve_extension include_extension;
extern const struct sieve_extension body_extension;
@@ -106,7 +106,7 @@ const struct sieve_extension *sieve_core_extensions[] = {
/* 'Plugins' */
&vacation_extension, &subaddress_extension,
&comparator_i_ascii_numeric_extension,
- &relational_extension, ®ex_extension, &imapflags_extension,
+ &relational_extension, ®ex_extension, &imap4flags_extension,
©_extension, &include_extension, &body_extension,
&variables_extension, &enotify_extension
};