cli: change while to for in keyword argument processing

[notmuch] / command-line-arguments.c

diff --git a/command-line-arguments.c b/command-line-arguments.c
index 39940d5fb9fd891076482c389782d93fd2783d20..c591dcbec7cc3e7f92b4043828b2a950f1215737 100644 (file)
--- a/command-line-arguments.c
+++ b/command-line-arguments.c
@@ -13,14 +13,14 @@
 static notmuch_bool_t
 _process_keyword_arg (const notmuch_opt_desc_t *arg_desc, char next, const char *arg_str) {
 
-    const notmuch_keyword_t *keywords = arg_desc->keywords;
+    const notmuch_keyword_t *keywords;
 
     if (next == '\0') {
        /* No keyword given */
        arg_str = "";
     }
 
-    while (keywords->name) {
+    for (keywords = arg_desc->keywords; keywords->name; keywords++) {
        if (strcmp (arg_str, keywords->name) == 0) {
            if (arg_desc->opt_flags)
                *arg_desc->opt_flags |= keywords->value;
@@ -28,7 +28,6 @@ _process_keyword_arg (const notmuch_opt_desc_t *arg_desc, char next, const char
                *arg_desc->opt_keyword = keywords->value;
            return TRUE;
        }
-       keywords++;
     }
     if (next != '\0')
        fprintf (stderr, "Unknown keyword argument \"%s\" for option \"%s\".\n", arg_str, arg_desc->name);
@@ -39,21 +38,20 @@ _process_keyword_arg (const notmuch_opt_desc_t *arg_desc, char next, const char
 
 static notmuch_bool_t
 _process_boolean_arg (const notmuch_opt_desc_t *arg_desc, char next, const char *arg_str) {
-
-    if (next == '\0') {
-       *arg_desc->opt_bool = TRUE;
-       return TRUE;
-    }
-    if (strcmp (arg_str, "false") == 0) {
-       *arg_desc->opt_bool = FALSE;
-       return TRUE;
-    }
-    if (strcmp (arg_str, "true") == 0) {
-       *arg_desc->opt_bool = TRUE;
-       return TRUE;
+    notmuch_bool_t value;
+
+    if (next == '\0' || strcmp (arg_str, "true") == 0) {
+       value = TRUE;
+    } else if (strcmp (arg_str, "false") == 0) {
+       value = FALSE;
+    } else {
+       fprintf (stderr, "Unknown argument \"%s\" for (boolean) option \"%s\".\n", arg_str, arg_desc->name);
+       return FALSE;
     }
-    fprintf (stderr, "Unknown argument \"%s\" for (boolean) option \"%s\".\n", arg_str, arg_desc->name);
-    return FALSE;
+
+    *arg_desc->opt_bool = value;
+
+    return TRUE;
 }
 
 static notmuch_bool_t