From 648a6034e304c1ffa7fa8c291e03a0bca3c20288 Mon Sep 17 00:00:00 2001 From: Timo Sirainen Date: Sun, 27 Sep 2015 19:03:31 +0300 Subject: [PATCH] Make static analyzer happier. --- src/lib-mail/test-message-id.c | 3 ++- src/lib-storage/list/mailbox-list-index-status.c | 2 ++ src/lib-storage/mail-namespace.c | 2 ++ 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/lib-mail/test-message-id.c b/src/lib-mail/test-message-id.c index b8b0505380..184fbc4d7d 100644 --- a/src/lib-mail/test-message-id.c +++ b/src/lib-mail/test-message-id.c @@ -27,7 +27,8 @@ static void test_message_id_get_next(void) while ((next_msgid = message_id_get_next(&msgid)) != NULL) { if (output[j] == NULL) break; - test_assert(strcmp(output[j++], next_msgid) == 0); + test_assert(strcmp(output[j], next_msgid) == 0); + j++; } test_assert(output[j++] == NULL && next_msgid == NULL); } diff --git a/src/lib-storage/list/mailbox-list-index-status.c b/src/lib-storage/list/mailbox-list-index-status.c index 87a2c010ec..07a4ef9581 100644 --- a/src/lib-storage/list/mailbox-list-index-status.c +++ b/src/lib-storage/list/mailbox-list-index-status.c @@ -275,6 +275,8 @@ index_list_try_get_metadata(struct mailbox *box, enum mailbox_metadata_items noncached_items; int ret; + i_assert(metadata_r != NULL); + if (box->opened) { /* if mailbox is already opened, don't bother using the values in mailbox list index. they have a higher chance of being diff --git a/src/lib-storage/mail-namespace.c b/src/lib-storage/mail-namespace.c index 11c2a31e96..c3d3f84bf6 100644 --- a/src/lib-storage/mail-namespace.c +++ b/src/lib-storage/mail-namespace.c @@ -321,6 +321,8 @@ int mail_namespaces_init_finish(struct mail_namespace *namespaces, struct mail_namespace *ns; bool prefixless_found = FALSE; + i_assert(namespaces != NULL); + for (ns = namespaces; ns != NULL; ns = ns->next) { if (ns->prefix_len == 0) prefixless_found = TRUE; -- 2.47.3