diff options
| author | Jani Nikula <jani@nikula.org> | 2017-01-06 22:14:47 +0200 |
|---|---|---|
| committer | David Bremner <david@tethera.net> | 2017-03-10 07:52:29 -0400 |
| commit | f2160ae5404a740ee9afd76c33588389da4036f9 (patch) | |
| tree | e3bc21a64e9c0ad15724a68da0786678533d6b20 | |
| parent | 16f05079622586f51514228796de6bf2869cc1e2 (diff) | |
cli/show: group --entire-thread option handling into one place
The --entire-thread option handling is split around, making the logic
harder to follow than necessary. Put it in one place. While at it,
make the true/false values match notmuch_bool_t values for
simplicity. No functional changes.
| -rw-r--r-- | notmuch-show.c | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/notmuch-show.c b/notmuch-show.c index 6fae9fb0..d406d5e3 100644 --- a/notmuch-show.c +++ b/notmuch-show.c @@ -1016,9 +1016,9 @@ static const notmuch_show_format_t *formatters[] = { }; enum { - ENTIRE_THREAD_DEFAULT, - ENTIRE_THREAD_TRUE, - ENTIRE_THREAD_FALSE, + ENTIRE_THREAD_DEFAULT = -1, + ENTIRE_THREAD_FALSE = FALSE, + ENTIRE_THREAD_TRUE = TRUE, }; /* The following is to allow future options to be added more easily */ @@ -1116,9 +1116,11 @@ notmuch_show_command (notmuch_config_t *config, int argc, char *argv[]) * format=sexp. */ if (entire_thread == ENTIRE_THREAD_DEFAULT) { if (format == NOTMUCH_FORMAT_JSON || format == NOTMUCH_FORMAT_SEXP) - entire_thread = ENTIRE_THREAD_TRUE; + params.entire_thread = TRUE; else - entire_thread = ENTIRE_THREAD_FALSE; + params.entire_thread = FALSE; + } else { + params.entire_thread = entire_thread; } if (!params.output_body) { @@ -1137,11 +1139,6 @@ notmuch_show_command (notmuch_config_t *config, int argc, char *argv[]) fprintf (stderr, "Warning: --include-html only implemented for format=json and format=sexp\n"); } - if (entire_thread == ENTIRE_THREAD_TRUE) - params.entire_thread = TRUE; - else - params.entire_thread = FALSE; - query_string = query_string_from_args (config, argc-opt_index, argv+opt_index); if (query_string == NULL) { fprintf (stderr, "Out of memory\n"); |