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

63
command-line-arguments.c
View file

@ -129,40 +129,41 @@ 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.
*/
if (next != '=' && next != ':' && next != '\0')
continue;
if (try->output_var == NULL) char next = arg[strlen (try->name)];
INTERNAL_ERROR ("output pointer NULL for option %s", try->name); const char *value = arg + strlen(try->name) + 1;
switch (try->opt_type) { /*
case NOTMUCH_OPT_KEYWORD: * If we have not reached the end of the argument (i.e. the
return _process_keyword_arg (try, next, value); * next character is not a space or delimiter) then the
break; * argument could still match a longer option name later in
case NOTMUCH_OPT_BOOLEAN: * the option table.
return _process_boolean_arg (try, next, value); */
break; if (next != '=' && next != ':' && next != '\0')
case NOTMUCH_OPT_INT: continue;
return _process_int_arg (try, next, value);
break; if (try->output_var == NULL)
case NOTMUCH_OPT_STRING: INTERNAL_ERROR ("output pointer NULL for option %s", try->name);
return _process_string_arg (try, next, value);
break; switch (try->opt_type) {
case NOTMUCH_OPT_POSITION: case NOTMUCH_OPT_KEYWORD:
case NOTMUCH_OPT_END: return _process_keyword_arg (try, next, value);
default: case NOTMUCH_OPT_BOOLEAN:
INTERNAL_ERROR ("unknown or unhandled option type %d", try->opt_type); return _process_boolean_arg (try, next, value);
/*UNREACHED*/ case NOTMUCH_OPT_INT:
} return _process_int_arg (try, next, value);
case NOTMUCH_OPT_STRING:
return _process_string_arg (try, next, value);
case NOTMUCH_OPT_POSITION:
case NOTMUCH_OPT_END:
default:
INTERNAL_ERROR ("unknown or unhandled option type %d", try->opt_type);
/*UNREACHED*/
} }
} }
fprintf (stderr, "Unrecognized option: --%s\n", arg); fprintf (stderr, "Unrecognized option: --%s\n", arg);