Mercurial > dovecot > core-2.2

changeset 20635:949d3a1ca80b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
-Wstrict-bool warning fixes
author Timo Sirainen <timo.sirainen@dovecot.fi>
date Thu, 11 Aug 2016 17:27:24 +0300
parents a1897e1b0337
children f6e9998ddc0f
files src/doveadm/doveadm-auth-server.c src/doveadm/doveadm-dump-dcrypt-file.c
diffstat 2 files changed, 3 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/src/doveadm/doveadm-auth-server.c	Thu Aug 11 17:23:48 2016 +0300
+++ b/src/doveadm/doveadm-auth-server.c	Thu Aug 11 17:27:24 2016 +0300
@@ -91,7 +91,7 @@
 		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 @@
 			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, '=');
--- a/src/doveadm/doveadm-dump-dcrypt-file.c	Thu Aug 11 17:23:48 2016 +0300
+++ b/src/doveadm/doveadm-dump-dcrypt-file.c	Thu Aug 11 17:27:24 2016 +0300
@@ -41,7 +41,7 @@
 	}
 }
 
-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);