1 Return-Path: <jrollins@servo.finestructure.net>
\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 15B33429E47
\r
6 for <notmuch@notmuchmail.org>; Wed, 25 May 2011 18:01:36 -0700 (PDT)
\r
7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org
\r
11 X-Spam-Status: No, score=-1.921 tagged_above=-999 required=5
\r
12 tests=[NO_DNS_FOR_FROM=0.379, RCVD_IN_DNSWL_MED=-2.3]
\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 7rFbzX-TBcWB for <notmuch@notmuchmail.org>;
\r
17 Wed, 25 May 2011 18:01:34 -0700 (PDT)
\r
18 Received: from outgoing-mail.its.caltech.edu (outgoing-mail.its.caltech.edu
\r
20 by olra.theworths.org (Postfix) with ESMTP id 38F32429E28
\r
21 for <notmuch@notmuchmail.org>; Wed, 25 May 2011 18:01:34 -0700 (PDT)
\r
22 Received: from fire-doxen.imss.caltech.edu (localhost [127.0.0.1])
\r
23 by fire-doxen-postvirus (Postfix) with ESMTP id D6EB03282C9;
\r
24 Wed, 25 May 2011 17:55:18 -0700 (PDT)
\r
25 X-Spam-Scanned: at Caltech-IMSS on fire-doxen by amavisd-new
\r
26 Received: from servo.finestructure.net (gwave-104.ligo.caltech.edu
\r
27 [131.215.114.104]) (Authenticated sender: jrollins)
\r
28 by fire-doxen-submit (Postfix) with ESMTP id 185B43282BE;
\r
29 Wed, 25 May 2011 17:55:11 -0700 (PDT)
\r
30 Received: by servo.finestructure.net (Postfix, from userid 1000)
\r
31 id 744CD7C2; Wed, 25 May 2011 18:01:26 -0700 (PDT)
\r
32 From: Jameson Graef Rollins <jrollins@finestructure.net>
\r
33 To: notmuch@notmuchmail.org
\r
34 Subject: [PATCH 03/11] Use empty strings instead of NULL in format_reply
\r
36 Date: Wed, 25 May 2011 18:01:12 -0700
\r
37 Message-Id: <1306371680-19441-4-git-send-email-jrollins@finestructure.net>
\r
38 X-Mailer: git-send-email 1.7.4.4
\r
39 In-Reply-To: <1306371680-19441-1-git-send-email-jrollins@finestructure.net>
\r
40 References: <1306371680-19441-1-git-send-email-jrollins@finestructure.net>
\r
41 X-BeenThere: notmuch@notmuchmail.org
\r
42 X-Mailman-Version: 2.1.13
\r
44 List-Id: "Use and development of the notmuch mail system."
\r
45 <notmuch.notmuchmail.org>
\r
46 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
\r
47 <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
\r
48 List-Archive: <http://notmuchmail.org/pipermail/notmuch>
\r
49 List-Post: <mailto:notmuch@notmuchmail.org>
\r
50 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
\r
51 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
\r
52 <mailto:notmuch-request@notmuchmail.org?subject=subscribe>
\r
53 X-List-Received-Date: Thu, 26 May 2011 01:01:36 -0000
\r
55 This keeps things consistent with notmuch-show, and prevents having to
\r
56 check for the existence of the field pointer for simple string output
\r
59 notmuch-reply.c | 12 ++++++------
\r
60 show-message.c | 2 +-
\r
61 2 files changed, 7 insertions(+), 7 deletions(-)
\r
63 diff --git a/notmuch-reply.c b/notmuch-reply.c
\r
64 index 8c5e76c..7959935 100644
\r
65 --- a/notmuch-reply.c
\r
66 +++ b/notmuch-reply.c
\r
67 @@ -29,12 +29,12 @@ reply_part (GMimeObject *part,
\r
68 unused (int *part_count));
\r
70 static const notmuch_show_format_t format_reply = {
\r
74 - NULL, reply_part, NULL, NULL, NULL,
\r
80 + "", reply_part, NULL, "", "",
\r
86 diff --git a/show-message.c b/show-message.c
\r
87 index 2ec9eca..32bb860 100644
\r
88 --- a/show-message.c
\r
89 +++ b/show-message.c
\r
90 @@ -46,7 +46,7 @@ show_message_part (GMimeObject *part,
\r
91 selected = (params->part <= 0 || state->part_count == params->part);
\r
93 if (selected || state->in_zone) {
\r
94 - if (!first && (params->part <= 0 || state->in_zone) && format->part_sep)
\r
95 + if (!first && (params->part <= 0 || state->in_zone))
\r
96 fputs (format->part_sep, stdout);
\r
98 format->part (part, &(state->part_count));
\r