From: Jani Nikula <jani@nikula.org>
Date: Fri, 6 Jan 2017 20:14:44 +0000 (+0200)
Subject: cli/show: consistently use format_sel for checking the format
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=1232584040491186d5d95e8112f019fb823ddd63;p=notmuch.git

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.
---

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");
 	}