-Wstrict-bool warning fixes

diff --git a/src/doveadm/doveadm-auth-server.c b/src/doveadm/doveadm-auth-server.c
index eb1d9aa9fca5018e574de495f5f024470d378007..2b550da066985a8b658b0a4af82b2f6970d586c8 100644 (file)
--- 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 345868f13743df0da38f10cc47add23110798252..bdc469930ad4667b5d11cb1677f11caae3718fba 100644 (file)
--- 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);