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 2A6056DE0A9A for ; Fri, 6 Jan 2017 12:14:57 -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_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 n4A6ngYW8E_x for ; Fri, 6 Jan 2017 12:14:55 -0800 (PST) Received: from mail-lf0-f68.google.com (mail-lf0-f68.google.com [209.85.215.68]) by arlo.cworth.org (Postfix) with ESMTPS id 78B776DE0A77 for ; Fri, 6 Jan 2017 12:14:55 -0800 (PST) Received: by mail-lf0-f68.google.com with SMTP id v186so687717lfa.2 for ; Fri, 06 Jan 2017 12:14:55 -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=Oz4QPwPgMbLExhe5+xtv9FMXumWyA45ntSpaH65vpas=; b=m6GiL1l56Ir3YSq4f9bMrcUJWVaPLQU/s8J8op2WDgdm8wIc9XBBbqj4Km0wpKSb+q JNCAb2mdQkd8BT/2LflzIHewmqpEeg+nZihmwMg9RNBsyP1jpyMLumuYycb+U2ducwYI tfJTUD8giX14RFMtjRNO7kHBH4DpJj+aGLZM+0iMSEooAN/N2/a5DFXCzqdTB6bRzP2O C5VJf/q8JAeNjK+DImMFFVNzC+JeKtsPdcJicHlAiGttqOstigvlgjknOa07uJSMW8qO o14wXVKim0C1wiVW3eDrE8R9d6tX3xl3xPeurutQOfEPkWZrbmZEA+hLjZCdUkVKkns3 5+MA== 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=Oz4QPwPgMbLExhe5+xtv9FMXumWyA45ntSpaH65vpas=; b=RPQTBaR0mGgGkTf1MooYrij+gx7t7dth8n+SwCSxYfseMYpPhluswaJJ9/l+2k5giU 7zRVkjtUZ+VdJiJqimywm7IWJ+kYxBhKK1Mzaju2goP+jtPW/znijN3vNxY3vLjgX8e5 wfqhAA0lnaG59HyBS17BLd8H5UxbVAy8sX5K2l05KxFCinR2Bi4almTZbEG6q8P6P9FI Rf8WYywDsVsR2vTeGtwkkEtVz7cDEhB/4x0nIB9ihiQcxftEHmgXQjg6QxnKM/Aiy9iy ekVs5vmFXGhxasHd6NSwKSt/Ppelgm1hF6skP7QVgXzaO4hyfOKityN4WeVdzXuDQwBT +T3Q== X-Gm-Message-State: AIkVDXLbXsl/QrRnqF7s1dBRYGXrl5v7MNHcpPcJsAdQ1X3FPMmVNdG+ySrVX7vrL6kAxA== X-Received: by 10.25.230.18 with SMTP id d18mr24518117lfh.98.1483733693760; Fri, 06 Jan 2017 12:14:53 -0800 (PST) Received: from localhost (dsl-hkibrasgw2-58c367-183.dhcp.inet.fi. [88.195.103.183]) by smtp.gmail.com with ESMTPSA id x10sm19363795lja.15.2017.01.06.12.14.52 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 06 Jan 2017 12:14:53 -0800 (PST) From: Jani Nikula To: notmuch@notmuchmail.org Subject: [PATCH 1/9] cli/show: detangle overloading of params.part for single message display Date: Fri, 6 Jan 2017 22:14:42 +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:14:57 -0000 The use of params.part has become rather convoluted in notmuch show. Add another variable for selecting single message display to make the code easier to read. No functional changes. --- notmuch-show.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/notmuch-show.c b/notmuch-show.c index 22fa655ad20d..2f0d142a26e2 100644 --- a/notmuch-show.c +++ b/notmuch-show.c @@ -1013,6 +1013,7 @@ notmuch_show_command (notmuch_config_t *config, int argc, char *argv[]) int format_sel = NOTMUCH_FORMAT_NOT_SPECIFIED; int exclude = EXCLUDE_TRUE; int entire_thread = ENTIRE_THREAD_DEFAULT; + notmuch_bool_t single_message; notmuch_opt_desc_t options[] = { { NOTMUCH_OPT_KEYWORD, &format_sel, "format", 'f', @@ -1051,6 +1052,9 @@ notmuch_show_command (notmuch_config_t *config, int argc, char *argv[]) if (params.crypto.decrypt) params.crypto.verify = TRUE; + /* specifying a part implies single message display */ + single_message = params.part >= 0; + if (format_sel == NOTMUCH_FORMAT_NOT_SPECIFIED) { /* if part was requested and format was not specified, use format=raw */ if (params.part >= 0) @@ -1079,10 +1083,8 @@ notmuch_show_command (notmuch_config_t *config, int argc, char *argv[]) break; case NOTMUCH_FORMAT_RAW: format = &format_raw; - /* If --format=raw specified without specifying part, we can only - * output single message, so set part=0 */ - if (params.part < 0) - params.part = 0; + /* raw format only supports single message display */ + single_message = TRUE; params.raw = TRUE; break; } @@ -1148,9 +1150,9 @@ notmuch_show_command (notmuch_config_t *config, int argc, char *argv[]) sprinter = format->new_sprinter(config, stdout); /* If a single message is requested we do not use search_excludes. */ - if (params.part >= 0) + if (single_message) { ret = do_show_single (config, query, format, sprinter, ¶ms); - else { + } else { /* We always apply set the exclude flag. The * exclude=true|false option controls whether or not we return * threads that only match in an excluded message */ -- 2.11.0