dovecot-1.2-sieve: Fixed series of AIX compiler warnings.

[pigeonhole at rename-it.nl]

details:   http://hg.rename-it.nl/dovecot-1.2-sieve/rev/79c7ce4095f8
changeset: 1274:79c7ce4095f8
user:      Stephan Bosch <stephan at rename-it.nl>
date:      Sun Sep 12 14:02:45 2010 +0200
description:
Fixed series of AIX compiler warnings.

diffstat:

 src/lib-sieve/plugins/body/tst-body.c                     |   4 ++--
 src/lib-sieve/plugins/include/ext-include-binary.c        |   5 +++--
 src/lib-sieve/plugins/notify/ext-notify-common.c          |   4 ++--
 src/lib-sieve/plugins/variables/ext-variables-arguments.c |   3 +--
 src/lib-sieve/sieve-plugins.c                             |  17 +++++++++++++----
 5 files changed, 21 insertions(+), 12 deletions(-)

diffs (123 lines):

diff -r 80ec0a0d054f -r 79c7ce4095f8 src/lib-sieve/plugins/body/tst-body.c
--- a/src/lib-sieve/plugins/body/tst-body.c	Sun Sep 05 16:38:20 2010 +0200
+++ b/src/lib-sieve/plugins/body/tst-body.c	Sun Sep 12 14:02:45 2010 +0200
@@ -256,7 +256,7 @@
 static bool ext_body_operation_dump
 (const struct sieve_dumptime_env *denv, sieve_size_t *address)
 {
-	enum tst_body_transform transform;
+	unsigned int transform;
 	int opt_code = 0;
 
 	sieve_code_dumpf(denv, "BODY");
@@ -317,7 +317,7 @@
 		SIEVE_COMPARATOR_DEFAULT(i_ascii_casemap_comparator);
 	struct sieve_match_type mtch = 
 		SIEVE_MATCH_TYPE_DEFAULT(is_match_type);
-	enum tst_body_transform transform;
+	unsigned int transform = TST_BODY_TRANSFORM_TEXT;
 	struct sieve_coded_stringlist *key_list, *ctype_list = NULL;
 	struct sieve_match_context *mctx;
 	const char * const *content_types = _no_content_types;
diff -r 80ec0a0d054f -r 79c7ce4095f8 src/lib-sieve/plugins/include/ext-include-binary.c
--- a/src/lib-sieve/plugins/include/ext-include-binary.c	Sun Sep 05 16:38:20 2010 +0200
+++ b/src/lib-sieve/plugins/include/ext-include-binary.c	Sun Sep 12 14:02:45 2010 +0200
@@ -264,7 +264,7 @@
 	/* Read dependencies */
 	for ( i = 0; i < depcount; i++ ) {
 		unsigned int block_id;
-		enum ext_include_script_location location;
+		unsigned int location;
 		string_t *script_name;
 		const char *script_dir;
 		struct sieve_script *script;
@@ -297,7 +297,8 @@
 			return FALSE;
 		}
 		
-		(void)ext_include_binary_script_include(binctx, script, location, block_id);
+		(void)ext_include_binary_script_include
+			(binctx, script, (enum ext_include_script_location) location, block_id);
 				
 		sieve_script_unref(&script);
 	}
diff -r 80ec0a0d054f -r 79c7ce4095f8 src/lib-sieve/plugins/notify/ext-notify-common.c
--- a/src/lib-sieve/plugins/notify/ext-notify-common.c	Sun Sep 05 16:38:20 2010 +0200
+++ b/src/lib-sieve/plugins/notify/ext-notify-common.c	Sun Sep 12 14:02:45 2010 +0200
@@ -131,12 +131,12 @@
 	/* Parse content type */
 	content_type = t_str_new(64);
 	if (rfc822_parse_content_type(&parser, content_type) < 0)
-		return "";
+		return FALSE;
 
 	/* Content-type value must end here, otherwise it is invalid after all */
 	(void)rfc822_skip_lwsp(&parser);
 	if ( parser.data != parser.end && *parser.data != ';' )
-		return "";
+		return FALSE;
 
 	/* Success */
 	data = str_c(content_type);
diff -r 80ec0a0d054f -r 79c7ce4095f8 src/lib-sieve/plugins/variables/ext-variables-arguments.c
--- a/src/lib-sieve/plugins/variables/ext-variables-arguments.c	Sun Sep 05 16:38:20 2010 +0200
+++ b/src/lib-sieve/plugins/variables/ext-variables-arguments.c	Sun Sep 12 14:02:45 2010 +0200
@@ -54,8 +54,7 @@
 	
 	arg->argument = sieve_argument_create(ast, &variable_argument, this_ext, 0);
 	arg->argument->data = (void *) var;
-	
-	return arg;
+	return TRUE;
 }
 
 static struct sieve_ast_argument *ext_variables_variable_argument_create
diff -r 80ec0a0d054f -r 79c7ce4095f8 src/lib-sieve/sieve-plugins.c
--- a/src/lib-sieve/sieve-plugins.c	Sun Sep 05 16:38:20 2010 +0200
+++ b/src/lib-sieve/sieve-plugins.c	Sun Sep 12 14:02:45 2010 +0200
@@ -11,6 +11,15 @@
 #include "sieve-common.h"
 #include "sieve-plugins.h"
 
+/*
+ * Types
+ */
+
+typedef void (*sieve_plugin_load_func_t)
+	(struct sieve_instance *svinst, void **context);
+typedef void (*sieve_plugin_unload_func_t)
+	(struct sieve_instance *svinst, void *context);
+
 struct sieve_plugin {
 	struct module *module;
 	
@@ -122,7 +131,7 @@
  	for (i = 0; module_names[i] != NULL; i++) {
 		struct sieve_plugin *plugin;
 		const char *name = module_names[i];
-		void (*load_func)(struct sieve_instance *svinst, void **context);
+		sieve_plugin_load_func_t load_func;
 
 		/* Find the module */
 		module = sieve_plugin_module_find(name);
@@ -145,7 +154,7 @@
 		plugin->module = module;
 	
 		/* Call load function */
-		load_func = module_get_symbol
+		load_func = (sieve_plugin_load_func_t) module_get_symbol
 			(module, t_strdup_printf("%s_load", module->name));
 		if ( load_func != NULL ) {
 			load_func(svinst, &plugin->context);
@@ -178,9 +187,9 @@
 	plugin = svinst->plugins;
 	while ( plugin != NULL ) {
 		struct module *module = plugin->module;
-		void (*unload_func)(struct sieve_instance *svinst, void *context);
+		sieve_plugin_unload_func_t unload_func;
 
-		unload_func = module_get_symbol
+		unload_func = (sieve_plugin_unload_func_t)module_get_symbol
 			(module, t_strdup_printf("%s_unload", module->name));
 		if ( unload_func != NULL ) {
 			unload_func(svinst, plugin->context);