cli: reduce indent in keyword argument processing

[notmuch] / command-line-arguments.c

diff --git a/command-line-arguments.c b/command-line-arguments.c
index f1a5b2324337fb2ceb78f6fcde64133f8f12454c..3fa8d9044966973cc0a53ba8249e431577fc69fb 100644 (file)
--- a/command-line-arguments.c
+++ b/command-line-arguments.c
@@ -13,22 +13,23 @@
 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) {
-       if (strcmp (arg_str, keywords->name) == 0) {
-           if (arg_desc->opt_flags)
-               *arg_desc->opt_flags |= keywords->value;
-           else
-               *arg_desc->opt_keyword = keywords->value;
-           return TRUE;
-       }
-       keywords++;
+    for (keywords = arg_desc->keywords; keywords->name; keywords++) {
+       if (strcmp (arg_str, keywords->name) != 0)
+           continue;
+
+       if (arg_desc->opt_flags)
+           *arg_desc->opt_flags |= keywords->value;
+       else
+           *arg_desc->opt_keyword = keywords->value;
+
+       return TRUE;
     }
     if (next != '\0')
        fprintf (stderr, "Unknown keyword argument \"%s\" for option \"%s\".\n", arg_str, arg_desc->name);
@@ -39,21 +40,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
@@ -128,6 +128,8 @@ parse_position_arg (const char *arg_str, int pos_arg_index,
        if (arg_desc->opt_position) {
            if (pos_arg_counter == pos_arg_index) {
                *arg_desc->opt_position = arg_str;
+               if (arg_desc->present)
+                   *arg_desc->present = TRUE;
                return TRUE;
            }
            pos_arg_counter++;
@@ -202,10 +204,13 @@ parse_option (int argc, char **argv, const notmuch_opt_desc_t *options, int opt_
        else
            INTERNAL_ERROR ("unknown or unhandled option \"%s\"", try->name);
 
-       if (opt_status)
-           return opt_index+1;
-       else
+       if (! opt_status)
            return -1;
+
+       if (try->present)
+           *try->present = TRUE;
+
+       return opt_index+1;
     }
     return -1;
 }