From: Timo Sirainen <timo.sirainen@dovecot.fi>
Date: Thu, 11 Aug 2016 14:27:24 +0000 (+0300)
Subject: -Wstrict-bool warning fixes
X-Git-Tag: 2.2.26~366
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=bb6928d6ddb1cccb101bf24d3667a8793fb5e9d5;p=thirdparty%2Fdovecot%2Fcore.git

-Wstrict-bool warning fixes
---

diff --git a/src/doveadm/doveadm-auth-server.c b/src/doveadm/doveadm-auth-server.c
index eb1d9aa9fc..2b550da066 100644
--- a/src/doveadm/doveadm-auth-server.c
+++ b/src/doveadm/doveadm-auth-server.c
@@ -91,7 +91,7 @@ cmd_user_input(struct auth_master_connection *conn,
 		string_t *json_field = t_str_new(show_field_len+1);
 		json_append_escaped(json_field, show_field);
 		o_stream_nsend_str(doveadm_print_ostream, t_strdup_printf("\"%s\":", str_c(json_field)));
-		for (; *fields; fields++) {
+		for (; *fields != NULL; fields++) {
 			if (strncmp(*fields, show_field, show_field_len) == 0 &&
 			    (*fields)[show_field_len] == '=') {
 				string_t *jsonval = t_str_new(32);
@@ -113,7 +113,7 @@ cmd_user_input(struct auth_master_connection *conn,
 			o_stream_nsend_str(doveadm_print_ostream, str_c(jsonval));
 			o_stream_nsend_str(doveadm_print_ostream, "\"");
 		}
-		for (; *fields; fields++) {
+		for (; *fields != NULL; fields++) {
 			const char *field = *fields;
 			if (*field == '\0') continue;
 			p = strchr(*fields, '=');
diff --git a/src/doveadm/doveadm-dump-dcrypt-file.c b/src/doveadm/doveadm-dump-dcrypt-file.c
index 345868f137..bdc469930a 100644
--- a/src/doveadm/doveadm-dump-dcrypt-file.c
+++ b/src/doveadm/doveadm-dump-dcrypt-file.c
@@ -41,7 +41,7 @@ static void dcrypt_istream_dump_metadata(const struct istream *stream)
 	}
 }
 
-static int dcrypt_file_dump_metadata(const char *filename, bool print)
+static bool dcrypt_file_dump_metadata(const char *filename, bool print)
 {
 	bool ret = FALSE;
 	struct istream *is = i_stream_create_file(filename, IO_BLOCK_SIZE);