debian/notmuch
1
0
Fork 0
mirror of https://git.notmuchmail.org/git/notmuch synced 2025-01-03 07:11:41 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

cli: command line option parser cleanup

Browse source 
Reduce the indentation for clarity. No functional changes.
This commit is contained in:
Jani Nikula 2014-02-24 23:36:58 +02:00 committed by David Bremner
parent 75d84dfd84
commit 6960b92bb6
1 changed files with 32 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
command-line-arguments.c
View file

@ -129,14 +129,20 @@ parse_option (const char *arg,
const notmuch_opt_desc_t *try; const notmuch_opt_desc_t *try;
for (try = options; try->opt_type != NOTMUCH_OPT_END; try++) { for (try = options; try->opt_type != NOTMUCH_OPT_END; try++) {
if (try->name && strncmp (arg, try->name, strlen (try->name)) == 0) { if (! try->name)
char next = arg[strlen (try->name)]; continue;
const char *value= arg+strlen(try->name)+1;
/* If we have not reached the end of the argument if (strncmp (arg, try->name, strlen (try->name)) != 0)
(i.e. the next character is not a space or delimiter) continue;
then the argument could still match a longer option
name later in the option table. char next = arg[strlen (try->name)];
const char *value = arg + strlen(try->name) + 1;
/*
* If we have not reached the end of the argument (i.e. the
* next character is not a space or delimiter) then the
* argument could still match a longer option name later in
* the option table.
*/ */
if (next != '=' && next != ':' && next != '\0') if (next != '=' && next != ':' && next != '\0')
continue; continue;
@ -147,16 +153,12 @@ parse_option (const char *arg,
switch (try->opt_type) { switch (try->opt_type) {
case NOTMUCH_OPT_KEYWORD: case NOTMUCH_OPT_KEYWORD:
return _process_keyword_arg (try, next, value); return _process_keyword_arg (try, next, value);
break;
case NOTMUCH_OPT_BOOLEAN: case NOTMUCH_OPT_BOOLEAN:
return _process_boolean_arg (try, next, value); return _process_boolean_arg (try, next, value);
break;
case NOTMUCH_OPT_INT: case NOTMUCH_OPT_INT:
return _process_int_arg (try, next, value); return _process_int_arg (try, next, value);
break;
case NOTMUCH_OPT_STRING: case NOTMUCH_OPT_STRING:
return _process_string_arg (try, next, value); return _process_string_arg (try, next, value);
break;
case NOTMUCH_OPT_POSITION: case NOTMUCH_OPT_POSITION:
case NOTMUCH_OPT_END: case NOTMUCH_OPT_END:
default: default:
@ -164,7 +166,6 @@ parse_option (const char *arg,
/*UNREACHED*/ /*UNREACHED*/
} }
} }
}
fprintf (stderr, "Unrecognized option: --%s\n", arg); fprintf (stderr, "Unrecognized option: --%s\n", arg);
return FALSE; return FALSE;
} }