From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from localhost (localhost [127.0.0.1]) by arlo.cworth.org (Postfix) with ESMTP id 95D446DE0B55 for ; Fri, 6 Jan 2017 12:15:01 -0800 (PST) X-Virus-Scanned: Debian amavisd-new at cworth.org X-Amavis-Alert: BAD HEADER SECTION, Duplicate header field: "References" X-Spam-Flag: NO X-Spam-Score: 0.277 X-Spam-Level: X-Spam-Status: No, score=0.277 tagged_above=-999 required=5 tests=[AWL=0.297, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01] autolearn=disabled Received: from arlo.cworth.org ([127.0.0.1]) by localhost (arlo.cworth.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id QymddyaGByed for ; Fri, 6 Jan 2017 12:15:01 -0800 (PST) Received: from mail-lf0-f65.google.com (mail-lf0-f65.google.com [209.85.215.65]) by arlo.cworth.org (Postfix) with ESMTPS id 3CBAE6DE0C5F for ; Fri, 6 Jan 2017 12:14:58 -0800 (PST) Received: by mail-lf0-f65.google.com with SMTP id q89so749839lfi.1 for ; Fri, 06 Jan 2017 12:14:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nikula-org.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :in-reply-to:references; bh=vtZmNADA+aYwFICSJnPdwRFf7XTN+68+0ryz1KjTMyY=; b=IsHO1Azi4jXyEEB0aG0Yo4PLS6mwlA0Ko21kFvU2fDEv7HVrfh6Qz0aZrzj2vflMk8 U25okkMJ2fbyr6gxyyHo2t4ocSLmjkeXXLqFDpPzcuJw448PddKLQKrrOutpfwHnN+6J szy7FxhqTN3GgiEGf24bt2Mq2Q7rUBnPhZ+IJT3fASaXNNg0eiupB2U4GH7fr18YMmkF GBvn/ESGWBl/nYbR/M+Ln2j1uaDE/D1inZblOSbtMQEs1oy9A4fWllp+ZKzSuC/XkFXy mndv1XB/GK+cf1OkQCUHBy8gIfIMuuKAgmfG30lnVC35eBxAd3lJYBU03Y7gAfAwV8vW 6h4w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:in-reply-to:references; bh=vtZmNADA+aYwFICSJnPdwRFf7XTN+68+0ryz1KjTMyY=; b=n5ARcD8yKEf9U+7BnPFUnFvu+qormvOssGdrC+VLigypUYQKDK1Wz30EytluTcyH60 p65Kpb87y2jBdzvT8t0qUMC3H+TURxOBBjJ1O5PPLnXQV1UN4TLrNtbbZTV+0PXNhcCc 88Sc7e6I+c1/1p/KuEqn7tis+T/Plo3BPXXBS73LZuIUYhX9hJAs0ClIBRSiMwy048CX /8JdV8ilJ3aYt3H6w8qm5PFSiOlOFq7AWdnTPJML5mZnwoojRD2XErfjZdjOcvYJmv2c bAtaR47IB1p5GzF2Hgy9sCAS+NTdVbLhVkRfWC8qTaHz/FZejyYC28mU7XNJtUBYOTrk 5s2A== X-Gm-Message-State: AIkVDXIlcoSVVbW5oDH3pNiMiUqX+/v2lWzFaik265/LwbMGKgvd4Qj2JYRSDKU/TmBSVA== X-Received: by 10.46.70.1 with SMTP id t1mr30151130lja.29.1483733696390; Fri, 06 Jan 2017 12:14:56 -0800 (PST) Received: from localhost (dsl-hkibrasgw2-58c367-183.dhcp.inet.fi. [88.195.103.183]) by smtp.gmail.com with ESMTPSA id s64sm19227392lfs.38.2017.01.06.12.14.55 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 06 Jan 2017 12:14:55 -0800 (PST) From: Jani Nikula To: notmuch@notmuchmail.org Subject: [PATCH 3/9] cli/show: consistently use format_sel for checking the format Date: Fri, 6 Jan 2017 22:14:44 +0200 Message-Id: X-Mailer: git-send-email 2.11.0 In-Reply-To: References: In-Reply-To: References: X-BeenThere: notmuch@notmuchmail.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: "Use and development of the notmuch mail system." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 06 Jan 2017 20:15:01 -0000 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. --- notmuch-show.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/notmuch-show.c b/notmuch-show.c index 273b5d3ba3ac..b8e45f187360 100644 --- a/notmuch-show.c +++ b/notmuch-show.c @@ -1093,7 +1093,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; @@ -1104,7 +1105,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"); } -- 2.11.0