diff options
author | Jani Nikula <jani@nikula.org> | 2017-10-01 23:53:11 +0300 |
---|---|---|
committer | David Bremner <david@tethera.net> | 2017-10-04 22:00:42 -0300 |
commit | 4a6721970a42a9f86149fb5d395d1001fed2d305 (patch) | |
tree | 7ee198f5d38f841a580f9b9e30cce5999e8e74cd /notmuch-restore.c | |
parent | d57da17fcd30a5cbe191ccd42906e489dd2bd6a3 (diff) |
cli: use designated initializers for opt desc
Several changes at once, just to not have to change the same lines
several times over:
- Use designated initializers to initialize opt desc arrays.
- Only initialize the needed fields.
- Remove arg_id (short options) as unused.
- Replace opt_type and output_var with several type safe output
variables, where the output variable being non-NULL determines the
type. Introduce checks to ensure only one is set. The downside is
some waste of const space per argument; this could be saved by
retaining opt_type and using a union, but that's still pretty
verbose.
- Fix some variables due to the type safety. Mostly a good thing, but
leads to some enums being changed to ints. This is pedantically
correct, but somewhat annoying. We could also cast, but that defeats
the purpose a bit.
- Terminate the opt desc arrays using {}.
The output variable type safety and the ability to add new fields for
just some output types or arguments are the big wins. For example, if
we wanted to add a variable to set when the argument is present, we
could do so for just the arguments that need it.
Beauty is in the eye of the beholder, but I think this looks nice when
defining the arguments, and reduces some of the verbosity we have
there.
Diffstat (limited to 'notmuch-restore.c')
-rw-r--r-- | notmuch-restore.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/notmuch-restore.c b/notmuch-restore.c index d6429efb..0025e2c3 100644 --- a/notmuch-restore.c +++ b/notmuch-restore.c @@ -227,7 +227,7 @@ notmuch_restore_command (notmuch_config_t *config, int argc, char *argv[]) tag_op_flag_t flags = 0; tag_op_list_t *tag_ops; - char *input_file_name = NULL; + const char *input_file_name = NULL; const char *name_for_error = NULL; gzFile input = NULL; char *line = NULL; @@ -247,20 +247,20 @@ notmuch_restore_command (notmuch_config_t *config, int argc, char *argv[]) flags |= TAG_FLAG_MAILDIR_SYNC; notmuch_opt_desc_t options[] = { - { NOTMUCH_OPT_KEYWORD, &input_format, "format", 'f', + { .opt_keyword = &input_format, .name = "format", .keywords = (notmuch_keyword_t []){ { "auto", DUMP_FORMAT_AUTO }, { "batch-tag", DUMP_FORMAT_BATCH_TAG }, { "sup", DUMP_FORMAT_SUP }, { 0, 0 } } }, - { NOTMUCH_OPT_KEYWORD_FLAGS, &include, "include", 'I', + { .opt_flags = &include, .name = "include", .keywords = (notmuch_keyword_t []){ { "config", DUMP_INCLUDE_CONFIG }, { "properties", DUMP_INCLUDE_PROPERTIES }, { "tags", DUMP_INCLUDE_TAGS} } }, - { NOTMUCH_OPT_STRING, &input_file_name, "input", 'i', 0 }, - { NOTMUCH_OPT_BOOLEAN, &accumulate, "accumulate", 'a', 0 }, - { NOTMUCH_OPT_INHERIT, (void *) ¬much_shared_options, NULL, 0, 0 }, - { 0, 0, 0, 0, 0 } + { .opt_string = &input_file_name, .name = "input" }, + { .opt_bool = &accumulate, .name = "accumulate" }, + { .opt_inherit = notmuch_shared_options }, + { } }; opt_index = parse_arguments (argc, argv, options, 1); |