X-Git-Url: https://git.notmuchmail.org/git?a=blobdiff_plain;f=command-line-arguments.c;h=3fa8d9044966973cc0a53ba8249e431577fc69fb;hb=288c3660d8798141d86faee30b4394a450dda0ba;hp=ee8be18942d09407b7814bc838153ccbe3e3c53e;hpb=e70494785541c32989b5c31360e1d9ac57e106ee;p=notmuch diff --git a/command-line-arguments.c b/command-line-arguments.c index ee8be189..3fa8d904 100644 --- 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);