Mercurial > dovecot > original-hg > dovecot-1.2

changeset 3571:b871cd1dc60c HEAD

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Compiler warning fixes
author Timo Sirainen <tss@iki.fi>
date Sun, 11 Sep 2005 16:23:00 +0300
parents 6ea104e75c3d
children bb648f016990
files src/imap/cmd-search.c src/lib-imap/imap-bodystructure.c src/lib-imap/imap-parser.h src/lib-mail/message-header-search.c src/pop3-login/client-authenticate.c
diffstat 5 files changed, 16 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/src/imap/cmd-search.c	Sun Sep 11 16:19:26 2005 +0300
+++ b/src/imap/cmd-search.c	Sun Sep 11 16:23:00 2005 +0300
@@ -77,7 +77,7 @@
 		return TRUE;
 
 	if (args->type == IMAP_ARG_ATOM &&
-	    strcasecmp(IMAP_ARG_STR(args), "CHARSET") == 0) {
+	    strcasecmp(IMAP_ARG_STR_NONULL(args), "CHARSET") == 0) {
 		/* CHARSET specified */
 		args++;
 		if (args->type != IMAP_ARG_ATOM &&
--- a/src/lib-imap/imap-bodystructure.c	Sun Sep 11 16:19:26 2005 +0300
+++ b/src/lib-imap/imap-bodystructure.c	Sun Sep 11 16:23:00 2005 +0300
@@ -591,9 +591,10 @@
 	if (!str_append_imap_arg(str, &args[1]))
 		return FALSE;
 
-	text = strcasecmp(IMAP_ARG_STR(&args[0]), "text") == 0;
-	message_rfc822 = strcasecmp(IMAP_ARG_STR(&args[0]), "message") == 0 &&
-		strcasecmp(IMAP_ARG_STR(&args[1]), "rfc822") == 0;
+	text = strcasecmp(IMAP_ARG_STR_NONULL(&args[0]), "text") == 0;
+	message_rfc822 =
+		strcasecmp(IMAP_ARG_STR_NONULL(&args[0]), "message") == 0 &&
+		strcasecmp(IMAP_ARG_STR_NONULL(&args[1]), "rfc822") == 0;
 
 	args += 2;
 
--- a/src/lib-imap/imap-parser.h	Sun Sep 11 16:19:26 2005 +0300
+++ b/src/lib-imap/imap-parser.h	Sun Sep 11 16:23:00 2005 +0300
@@ -53,6 +53,11 @@
 	 (arg)->type == IMAP_ARG_LITERAL ? \
 	 (arg)->_data.str : _imap_arg_str_error(arg))
 
+#define IMAP_ARG_STR_NONULL(arg) \
+	((arg)->type == IMAP_ARG_ATOM || (arg)->type == IMAP_ARG_STRING || \
+	 (arg)->type == IMAP_ARG_LITERAL ? \
+	 (arg)->_data.str : _imap_arg_str_error(arg))
+
 #define IMAP_ARG_LITERAL_SIZE(arg) \
 	(((arg)->type == IMAP_ARG_LITERAL_SIZE || \
 	 (arg)->type == IMAP_ARG_LITERAL_SIZE_NONSYNC) ? \
--- a/src/lib-mail/message-header-search.c	Sun Sep 11 16:19:26 2005 +0300
+++ b/src/lib-mail/message-header-search.c	Sun Sep 11 16:23:00 2005 +0300
@@ -87,7 +87,7 @@
 				const char *charset,
 				struct header_search_context *ctx)
 {
-	const char *utf8_data;
+	const void *utf8_data;
 	size_t utf8_size;
 
 	if (ctx->unknown_charset) {
@@ -100,8 +100,8 @@
 		charset = ctx->key_charset;
 	}
 
-	utf8_data = charset_to_ucase_utf8_string(charset, NULL,
-						 data, size, &utf8_size);
+	utf8_data = charset_to_ucase_utf8_string(charset, NULL, data, size,
+						 &utf8_size);
 
 	if (utf8_data == NULL) {
 		/* unknown character set, or invalid data. just compare it
@@ -111,7 +111,7 @@
 	}
 
 	ctx->submatch = TRUE;
-	search_loop((const unsigned char *) utf8_data, utf8_size, ctx);
+	search_loop(utf8_data, utf8_size, ctx);
 	ctx->submatch = FALSE;
 }
 
--- a/src/pop3-login/client-authenticate.c	Sun Sep 11 16:19:26 2005 +0300
+++ b/src/pop3-login/client-authenticate.c	Sun Sep 11 16:23:00 2005 +0300
@@ -210,7 +210,8 @@
 
 	if (*args == '\0') {
 		/* Old-style SASL discovery, used by MS Outlook */
-		int i, count;
+		unsigned int i, count;
+
 		client_send_line(client, "+OK");
 		mech = auth_client_get_available_mechs(auth_client, &count);
 		for (i = 0; i < count; i++) {