diff options
| author | Jani Nikula <jani@nikula.org> | 2017-01-06 22:14:44 +0200 |
|---|---|---|
| committer | David Bremner <david@tethera.net> | 2017-03-10 07:47:56 -0400 |
| commit | 1232584040491186d5d95e8112f019fb823ddd63 (patch) | |
| tree | a91e5d6d6b7cc9fa46df9128bee2737142d21675 | |
| parent | 33944a559a4ae7589347b7e7a3da5dd810a4c136 (diff) | |
cli/show: consistently use format_sel for checking the format
The mixed use of the format pointer and the format selection variables
is confusing. Add more clarity by using format_sel alone. No
functional changes.
| -rw-r--r-- | notmuch-show.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/notmuch-show.c b/notmuch-show.c index ef675b4d..2cec339a 100644 --- a/notmuch-show.c +++ b/notmuch-show.c @@ -1122,7 +1122,8 @@ notmuch_show_command (notmuch_config_t *config, int argc, char *argv[]) /* Default is entire-thread = FALSE except for format=json and * format=sexp. */ if (entire_thread == ENTIRE_THREAD_DEFAULT) { - if (format == &format_json || format == &format_sexp) + if (format_sel == NOTMUCH_FORMAT_JSON || + format_sel == NOTMUCH_FORMAT_SEXP) entire_thread = ENTIRE_THREAD_TRUE; else entire_thread = ENTIRE_THREAD_FALSE; @@ -1133,7 +1134,8 @@ notmuch_show_command (notmuch_config_t *config, int argc, char *argv[]) fprintf (stderr, "Warning: --body=false is incompatible with --part > 0. Disabling.\n"); params.output_body = TRUE; } else { - if (format != &format_json && format != &format_sexp) + if (format_sel != NOTMUCH_FORMAT_JSON && + format_sel != NOTMUCH_FORMAT_SEXP) fprintf (stderr, "Warning: --body=false only implemented for format=json and format=sexp\n"); } |