1 Return-Path: <jani@nikula.org>
\r
2 X-Original-To: notmuch@notmuchmail.org
\r
3 Delivered-To: notmuch@notmuchmail.org
\r
4 Received: from localhost (localhost [127.0.0.1])
\r
5 by olra.theworths.org (Postfix) with ESMTP id 0FC2A431FC7
\r
6 for <notmuch@notmuchmail.org>; Mon, 6 Feb 2012 11:57:42 -0800 (PST)
\r
7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org
\r
8 X-Amavis-Alert: BAD HEADER SECTION, Duplicate header field: "References"
\r
12 X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5
\r
13 tests=[RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled
\r
14 Received: from olra.theworths.org ([127.0.0.1])
\r
15 by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)
\r
16 with ESMTP id XT9-9X2uzkrw for <notmuch@notmuchmail.org>;
\r
17 Mon, 6 Feb 2012 11:57:41 -0800 (PST)
\r
18 Received: from mail-lpp01m010-f53.google.com (mail-lpp01m010-f53.google.com
\r
19 [209.85.215.53]) (using TLSv1 with cipher RC4-SHA (128/128 bits))
\r
20 (No client certificate requested)
\r
21 by olra.theworths.org (Postfix) with ESMTPS id 6DCFA431FAF
\r
22 for <notmuch@notmuchmail.org>; Mon, 6 Feb 2012 11:57:38 -0800 (PST)
\r
23 Received: by mail-lpp01m010-f53.google.com with SMTP id d3so3838995lah.26
\r
24 for <notmuch@notmuchmail.org>; Mon, 06 Feb 2012 11:57:38 -0800 (PST)
\r
25 Received: by 10.112.102.37 with SMTP id fl5mr5317381lbb.95.1328558258005;
\r
26 Mon, 06 Feb 2012 11:57:38 -0800 (PST)
\r
27 Received: from localhost (dsl-hkibrasgw4-fe50f800-253.dhcp.inet.fi.
\r
29 by mx.google.com with ESMTPS id k4sm13781781lbw.10.2012.02.06.11.57.35
\r
30 (version=SSLv3 cipher=OTHER); Mon, 06 Feb 2012 11:57:36 -0800 (PST)
\r
31 From: Jani Nikula <jani@nikula.org>
\r
32 To: notmuch@notmuchmail.org
\r
33 Subject: [PATCH v2 3/3] cli: reach previously unreachable cleanup code in
\r
35 Date: Mon, 6 Feb 2012 21:57:23 +0200
\r
37 <8da04ac681ef083f60b4dd01b7fbdda241a11ce9.1328558175.git.jani@nikula.org>
\r
38 X-Mailer: git-send-email 1.7.5.4
\r
39 In-Reply-To: <cover.1328558175.git.jani@nikula.org>
\r
41 <df2e9bd7682e9c81e1b205cc1d92a1526cdd1a9b.1328308635.git.jani@nikula.org>
\r
42 <cover.1328558175.git.jani@nikula.org>
\r
43 In-Reply-To: <cover.1328558175.git.jani@nikula.org>
\r
44 References: <cover.1328558175.git.jani@nikula.org>
\r
45 X-BeenThere: notmuch@notmuchmail.org
\r
46 X-Mailman-Version: 2.1.13
\r
48 List-Id: "Use and development of the notmuch mail system."
\r
49 <notmuch.notmuchmail.org>
\r
50 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
\r
51 <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
\r
52 List-Archive: <http://notmuchmail.org/pipermail/notmuch>
\r
53 List-Post: <mailto:notmuch@notmuchmail.org>
\r
54 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
\r
55 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
\r
56 <mailto:notmuch-request@notmuchmail.org?subject=subscribe>
\r
57 X-List-Received-Date: Mon, 06 Feb 2012 19:57:42 -0000
\r
59 The last lines of notmuch_show_command() function were
\r
60 unreachable. Fix it by using a variable for return value.
\r
62 Signed-off-by: Jani Nikula <jani@nikula.org>
\r
64 notmuch-show.c | 8 ++++----
\r
65 1 files changed, 4 insertions(+), 4 deletions(-)
\r
67 diff --git a/notmuch-show.c b/notmuch-show.c
\r
68 index b358278..c8fbd79 100644
\r
69 --- a/notmuch-show.c
\r
70 +++ b/notmuch-show.c
\r
71 @@ -1064,7 +1064,7 @@ notmuch_show_command (void *ctx, unused (int argc), unused (char *argv[]))
\r
72 notmuch_database_t *notmuch;
\r
73 notmuch_query_t *query;
\r
76 + int opt_index, ret;
\r
77 const notmuch_show_format_t *format = &format_text;
\r
78 notmuch_show_params_t params = { .part = -1 };
\r
79 int format_sel = NOTMUCH_FORMAT_NOT_SPECIFIED;
\r
80 @@ -1169,9 +1169,9 @@ notmuch_show_command (void *ctx, unused (int argc), unused (char *argv[]))
\r
83 if (params.part >= 0)
\r
84 - return do_show_single (ctx, query, format, ¶ms);
\r
85 + ret = do_show_single (ctx, query, format, ¶ms);
\r
87 - return do_show (ctx, query, format, ¶ms);
\r
88 + ret = do_show (ctx, query, format, ¶ms);
\r
90 notmuch_query_destroy (query);
\r
91 notmuch_database_close (notmuch);
\r
92 @@ -1179,5 +1179,5 @@ notmuch_show_command (void *ctx, unused (int argc), unused (char *argv[]))
\r
93 if (params.cryptoctx)
\r
94 g_object_unref(params.cryptoctx);
\r