plugins: sieve-extprograms: Use sieve_ prefix consistently for sieve …

…elements visible as exported symbols.

This fixes a symbol clash with the imap-filter-sieve plugin. Both modules had
the symbol "cmd_filter".

src/plugins/sieve-extprograms/cmd-execute.c

@@ -43,7 +43,7 @@ static bool cmd_execute_generate
 	(const struct sieve_codegen_env *cgenv, 
 		struct sieve_command *ctx);
 
-const struct sieve_command_def cmd_execute = {
+const struct sieve_command_def sieve_cmd_execute = {
 	.identifier = "execute",
 	.type = SCT_HYBRID,
 	.positional_args = -1, /* We check positional arguments ourselves */
@@ -97,9 +97,9 @@ static bool cmd_execute_operation_dump
 static int cmd_execute_operation_execute
 	(const struct sieve_runtime_env *renv, sieve_size_t *address);
 
-const struct sieve_operation_def cmd_execute_operation = { 
+const struct sieve_operation_def sieve_opr_execute = {
 	.mnemonic = "EXECUTE",
-	.ext_def = &vnd_execute_extension, 
+	.ext_def = &sieve_ext_vnd_execute,
 	.dump = cmd_execute_operation_dump, 
 	.execute = cmd_execute_operation_execute
 };
@@ -219,7 +219,7 @@ static bool cmd_execute_generate_input_tag
 static bool cmd_execute_generate
 (const struct sieve_codegen_env *cgenv, struct sieve_command *cmd)
 {
-	sieve_operation_emit(cgenv->sblock, cmd->ext, &cmd_execute_operation);
+	sieve_operation_emit(cgenv->sblock, cmd->ext, &sieve_opr_execute);
 
 	/* Emit is_test flag */
 	sieve_binary_emit_byte(cgenv->sblock,

src/plugins/sieve-extprograms/cmd-filter.c

@@ -40,7 +40,7 @@ static bool cmd_filter_generate
 	(const struct sieve_codegen_env *cgenv, 
 		struct sieve_command *ctx);
 
-const struct sieve_command_def cmd_filter = {
+const struct sieve_command_def sieve_cmd_filter = {
 	.identifier = "filter",
 	.type = SCT_HYBRID,
 	.positional_args = -1, /* We check positional arguments ourselves */
@@ -60,9 +60,9 @@ static bool cmd_filter_operation_dump
 static int cmd_filter_operation_execute
 	(const struct sieve_runtime_env *renv, sieve_size_t *address);
 
-const struct sieve_operation_def cmd_filter_operation = { 
+const struct sieve_operation_def sieve_opr_filter = {
 	.mnemonic = "FILTER",
-	.ext_def = &vnd_filter_extension, 
+	.ext_def = &sieve_ext_vnd_filter,
 	.dump = cmd_filter_operation_dump, 
 	.execute = cmd_filter_operation_execute
 };
@@ -74,7 +74,7 @@ const struct sieve_operation_def cmd_filter_operation = {
 static bool cmd_filter_generate
 (const struct sieve_codegen_env *cgenv, struct sieve_command *cmd)
 {
-	sieve_operation_emit(cgenv->sblock, cmd->ext, &cmd_filter_operation);
+	sieve_operation_emit(cgenv->sblock, cmd->ext, &sieve_opr_filter);
 
 	/* Emit is_test flag */
 	sieve_binary_emit_byte(cgenv->sblock,

src/plugins/sieve-extprograms/cmd-pipe.c

@@ -35,7 +35,7 @@ static bool cmd_pipe_generate
 	(const struct sieve_codegen_env *cgenv, 
 		struct sieve_command *ctx);
 
-const struct sieve_command_def cmd_pipe = {
+const struct sieve_command_def sieve_cmd_pipe = {
 	.identifier = "pipe",
 	.type = SCT_COMMAND,
 	.positional_args = -1, /* We check positional arguments ourselves */
@@ -64,9 +64,9 @@ static bool cmd_pipe_operation_dump
 static int cmd_pipe_operation_execute
 	(const struct sieve_runtime_env *renv, sieve_size_t *address);
 
-const struct sieve_operation_def cmd_pipe_operation = { 
+const struct sieve_operation_def sieve_opr_pipe = {
 	.mnemonic = "PIPE",
-	.ext_def = &vnd_pipe_extension,
+	.ext_def = &sieve_ext_vnd_pipe,
 	.dump = cmd_pipe_operation_dump, 
 	.execute = cmd_pipe_operation_execute
 };
@@ -134,7 +134,7 @@ static bool cmd_pipe_registered
 static bool cmd_pipe_generate
 (const struct sieve_codegen_env *cgenv, struct sieve_command *cmd)
 {
-	sieve_operation_emit(cgenv->sblock, cmd->ext, &cmd_pipe_operation);
+	sieve_operation_emit(cgenv->sblock, cmd->ext, &sieve_opr_pipe);
 
 	/* Generate arguments */
 	if ( !sieve_generate_arguments(cgenv, cmd, NULL) )

src/plugins/sieve-extprograms/ext-execute.c

@@ -33,12 +33,12 @@ static void ext_execute_unload(const struct sieve_extension *ext);
 static bool ext_execute_validator_load
 	(const struct sieve_extension *ext, struct sieve_validator *valdtr);
 
-const struct sieve_extension_def vnd_execute_extension = { 
+const struct sieve_extension_def sieve_ext_vnd_execute = {
 	.name = "vnd.dovecot.execute",
 	.load = ext_execute_load,
 	.unload = ext_execute_unload,
 	.validator_load = ext_execute_validator_load,
-	SIEVE_EXT_DEFINE_OPERATION(cmd_execute_operation)
+	SIEVE_EXT_DEFINE_OPERATION(sieve_opr_execute)
 };
 
 /*
@@ -74,7 +74,7 @@ static bool ext_execute_validator_load
 (const struct sieve_extension *ext, struct sieve_validator *valdtr)
 {
 	/* Register commands */
-	sieve_validator_register_command(valdtr, ext, &cmd_execute);
+	sieve_validator_register_command(valdtr, ext, &sieve_cmd_execute);
 
 	return TRUE;
 }

src/plugins/sieve-extprograms/ext-filter.c

@@ -33,12 +33,12 @@ static void ext_filter_unload(const struct sieve_extension *ext);
 static bool ext_filter_validator_load
 	(const struct sieve_extension *ext, struct sieve_validator *valdtr);
 
-const struct sieve_extension_def vnd_filter_extension = { 
+const struct sieve_extension_def sieve_ext_vnd_filter = {
 	.name = "vnd.dovecot.filter",
 	.load = ext_filter_load,
 	.unload = ext_filter_unload,
 	.validator_load = ext_filter_validator_load,
-	SIEVE_EXT_DEFINE_OPERATION(cmd_filter_operation),
+	SIEVE_EXT_DEFINE_OPERATION(sieve_opr_filter),
 };
 
 /*
@@ -74,7 +74,7 @@ static bool ext_filter_validator_load
 (const struct sieve_extension *ext, struct sieve_validator *valdtr)
 {
 	/* Register commands */
-	sieve_validator_register_command(valdtr, ext, &cmd_filter);
+	sieve_validator_register_command(valdtr, ext, &sieve_cmd_filter);
 
 	return TRUE;
 }

src/plugins/sieve-extprograms/ext-pipe.c

@@ -33,12 +33,12 @@ static void ext_pipe_unload(const struct sieve_extension *ext);
 static bool ext_pipe_validator_load
 	(const struct sieve_extension *ext, struct sieve_validator *valdtr);
 
-const struct sieve_extension_def vnd_pipe_extension = { 
+const struct sieve_extension_def sieve_ext_vnd_pipe = {
 	.name = "vnd.dovecot.pipe",
 	.load = ext_pipe_load,
 	.unload = ext_pipe_unload,
 	.validator_load = ext_pipe_validator_load,
-	SIEVE_EXT_DEFINE_OPERATION(cmd_pipe_operation),
+	SIEVE_EXT_DEFINE_OPERATION(sieve_opr_pipe),
 };
 
 /*
@@ -76,16 +76,16 @@ static bool ext_pipe_validator_validate
 		struct sieve_ast_argument *require_arg,
 		bool required);
 
-const struct sieve_validator_extension pipe_validator_extension = {
-	.ext = &vnd_pipe_extension,
+static const struct sieve_validator_extension pipe_validator_extension = {
+	.ext = &sieve_ext_vnd_pipe,
 	.validate = ext_pipe_validator_validate
 };
 
 static bool ext_pipe_validator_load
 (const struct sieve_extension *ext, struct sieve_validator *valdtr)
 {
 	/* Register commands */
-	sieve_validator_register_command(valdtr, ext, &cmd_pipe);
+	sieve_validator_register_command(valdtr, ext, &sieve_cmd_pipe);
 
 	/* Register extension to validator */
 	sieve_validator_extension_register
@@ -106,7 +106,7 @@ static bool ext_pipe_validator_validate
 	if ( ext_config != NULL && ext_config->copy_ext != NULL ) {
 		/* Register :copy command tag */
 		sieve_ext_copy_register_tag(valdtr,
-			ext_config->copy_ext, cmd_pipe.identifier);
+			ext_config->copy_ext, sieve_cmd_pipe.identifier);
 	}
 	return TRUE;
 }

src/plugins/sieve-extprograms/sieve-extprograms-common.c

@@ -102,9 +102,9 @@ struct sieve_extprograms_config *sieve_extprograms_config_init
 			ext_config->default_input_eol = SIEVE_EXTPROGRAMS_EOL_LF;
 	}
 
-	if ( sieve_extension_is(ext, vnd_pipe_extension) ) 
+	if ( sieve_extension_is(ext, sieve_ext_vnd_pipe) ) 
 		ext_config->copy_ext = sieve_ext_copy_get_extension(ext->svinst);
-	if ( sieve_extension_is(ext, vnd_execute_extension) ) 
+	if ( sieve_extension_is(ext, sieve_ext_vnd_execute) ) 
 		ext_config->var_ext = sieve_ext_variables_get_extension(ext->svinst);
 	return ext_config;
 }

src/plugins/sieve-extprograms/sieve-extprograms-common.h

@@ -33,25 +33,25 @@ void sieve_extprograms_config_deinit
  * Extensions
  */
 
-extern const struct sieve_extension_def vnd_pipe_extension;
-extern const struct sieve_extension_def vnd_filter_extension;
-extern const struct sieve_extension_def vnd_execute_extension;
+extern const struct sieve_extension_def sieve_ext_vnd_pipe;
+extern const struct sieve_extension_def sieve_ext_vnd_filter;
+extern const struct sieve_extension_def sieve_ext_vnd_execute;
 
 /* 
  * Commands 
  */
 
-extern const struct sieve_command_def cmd_pipe;
-extern const struct sieve_command_def cmd_filter;
-extern const struct sieve_command_def cmd_execute;
+extern const struct sieve_command_def sieve_cmd_pipe;
+extern const struct sieve_command_def sieve_cmd_filter;
+extern const struct sieve_command_def sieve_cmd_execute;
 
 /*
  * Operations
  */
 
-extern const struct sieve_operation_def cmd_pipe_operation;
-extern const struct sieve_operation_def cmd_filter_operation;
-extern const struct sieve_operation_def cmd_execute_operation;
+extern const struct sieve_operation_def sieve_opr_pipe;
+extern const struct sieve_operation_def sieve_opr_filter;
+extern const struct sieve_operation_def sieve_opr_execute;
 
 /*
  * Program name and arguments

src/plugins/sieve-extprograms/sieve-extprograms-plugin.c

@@ -26,11 +26,11 @@ void sieve_extprograms_plugin_load
 	struct _plugin_context *pctx = i_new(struct _plugin_context, 1);
 
 	pctx->ext_pipe = sieve_extension_register
-		(svinst, &vnd_pipe_extension, FALSE);
+		(svinst, &sieve_ext_vnd_pipe, FALSE);
 	pctx->ext_filter = sieve_extension_register
-		(svinst, &vnd_filter_extension, FALSE);
+		(svinst, &sieve_ext_vnd_filter, FALSE);
 	pctx->ext_execute = sieve_extension_register
-		(svinst, &vnd_execute_extension, FALSE);
+		(svinst, &sieve_ext_vnd_execute, FALSE);
 
 	if ( svinst->debug ) {
 		sieve_sys_debug(svinst, "Sieve Extprograms plugin for %s version %s loaded",