cli: fix clang build warnings

[notmuch] / notmuch-search.c

diff --git a/notmuch-search.c b/notmuch-search.c
index 5036d8e44005532f9f525eb6f87c18234dccb1a4..a591d45b4c39bbaee8ba55edfb1c9fd91674bfd5 100644 (file)
--- a/notmuch-search.c
+++ b/notmuch-search.c
@@ -671,7 +671,7 @@ notmuch_search_command (notmuch_config_t *config, int argc, char *argv[])
        { NOTMUCH_OPT_INT, &ctx->offset, "offset", 'O', 0 },
        { NOTMUCH_OPT_INT, &ctx->limit, "limit", 'L', 0  },
        { NOTMUCH_OPT_INT, &ctx->dupe, "duplicate", 'D', 0  },
-       { NOTMUCH_OPT_INHERIT, &common_options, NULL, 0, 0 },
+       { NOTMUCH_OPT_INHERIT, (void *) &common_options, NULL, 0, 0 },
        { 0, 0, 0, 0, 0 }
     };
 
@@ -727,7 +727,7 @@ notmuch_address_command (notmuch_config_t *config, int argc, char *argv[])
          (notmuch_keyword_t []){ { "true", NOTMUCH_EXCLUDE_TRUE },
                                  { "false", NOTMUCH_EXCLUDE_FALSE },
                                  { 0, 0 } } },
-       { NOTMUCH_OPT_INHERIT, &common_options, NULL, 0, 0 },
+       { NOTMUCH_OPT_INHERIT, (void *) &common_options, NULL, 0, 0 },
        { 0, 0, 0, 0, 0 }
     };
 
@@ -735,8 +735,8 @@ notmuch_address_command (notmuch_config_t *config, int argc, char *argv[])
     if (opt_index < 0)
        return EXIT_FAILURE;
 
-    if (! ctx->output)
-       ctx->output = OUTPUT_SENDER | OUTPUT_RECIPIENTS;
+    if (! (ctx->output & (OUTPUT_SENDER | OUTPUT_RECIPIENTS)))
+       ctx->output |= OUTPUT_SENDER;
 
     if (_notmuch_search_prepare (ctx, config,
                                 argc - opt_index, argv + opt_index))