debian/notmuch
1
0
Fork 0
mirror of https://git.notmuchmail.org/git/notmuch synced 2024-11-25 12:28:09 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

cli/show: group --entire-thread option handling into one place

Browse source 
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.
This commit is contained in:
Jani Nikula 2017-01-06 22:14:47 +02:00 committed by David Bremner
parent 16f0507962
commit f2160ae540
1 changed files with 7 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
notmuch-show.c
View file

@ -1016,9 +1016,9 @@ static const notmuch_show_format_t *formatters[] = {
}; };
enum { enum {
ENTIRE_THREAD_DEFAULT, ENTIRE_THREAD_DEFAULT = -1,
ENTIRE_THREAD_TRUE, ENTIRE_THREAD_FALSE = FALSE,
ENTIRE_THREAD_FALSE, ENTIRE_THREAD_TRUE = TRUE,
}; };
/* The following is to allow future options to be added more easily */ /* 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. */ * format=sexp. */
if (entire_thread == ENTIRE_THREAD_DEFAULT) { if (entire_thread == ENTIRE_THREAD_DEFAULT) {
if (format == NOTMUCH_FORMAT_JSON || format == NOTMUCH_FORMAT_SEXP) if (format == NOTMUCH_FORMAT_JSON || format == NOTMUCH_FORMAT_SEXP)
entire_thread = ENTIRE_THREAD_TRUE; params.entire_thread = TRUE;
else else
entire_thread = ENTIRE_THREAD_FALSE; params.entire_thread = FALSE;
} else {
params.entire_thread = entire_thread;
} }
if (!params.output_body) { 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"); 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); query_string = query_string_from_args (config, argc-opt_index, argv+opt_index);
if (query_string == NULL) { if (query_string == NULL) {
fprintf (stderr, "Out of memory\n"); fprintf (stderr, "Out of memory\n");