Return-Path: X-Original-To: notmuch@notmuchmail.org Delivered-To: notmuch@notmuchmail.org Received: from localhost (localhost [127.0.0.1]) by olra.theworths.org (Postfix) with ESMTP id 15B33429E47 for ; Wed, 25 May 2011 18:01:36 -0700 (PDT) X-Virus-Scanned: Debian amavisd-new at olra.theworths.org X-Spam-Flag: NO X-Spam-Score: -1.921 X-Spam-Level: X-Spam-Status: No, score=-1.921 tagged_above=-999 required=5 tests=[NO_DNS_FOR_FROM=0.379, RCVD_IN_DNSWL_MED=-2.3] autolearn=disabled Received: from olra.theworths.org ([127.0.0.1]) by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 7rFbzX-TBcWB for ; Wed, 25 May 2011 18:01:34 -0700 (PDT) Received: from outgoing-mail.its.caltech.edu (outgoing-mail.its.caltech.edu [131.215.239.19]) by olra.theworths.org (Postfix) with ESMTP id 38F32429E28 for ; Wed, 25 May 2011 18:01:34 -0700 (PDT) Received: from fire-doxen.imss.caltech.edu (localhost [127.0.0.1]) by fire-doxen-postvirus (Postfix) with ESMTP id D6EB03282C9; Wed, 25 May 2011 17:55:18 -0700 (PDT) X-Spam-Scanned: at Caltech-IMSS on fire-doxen by amavisd-new Received: from servo.finestructure.net (gwave-104.ligo.caltech.edu [131.215.114.104]) (Authenticated sender: jrollins) by fire-doxen-submit (Postfix) with ESMTP id 185B43282BE; Wed, 25 May 2011 17:55:11 -0700 (PDT) Received: by servo.finestructure.net (Postfix, from userid 1000) id 744CD7C2; Wed, 25 May 2011 18:01:26 -0700 (PDT) From: Jameson Graef Rollins To: notmuch@notmuchmail.org Subject: [PATCH 03/11] Use empty strings instead of NULL in format_reply structure. Date: Wed, 25 May 2011 18:01:12 -0700 Message-Id: <1306371680-19441-4-git-send-email-jrollins@finestructure.net> X-Mailer: git-send-email 1.7.4.4 In-Reply-To: <1306371680-19441-1-git-send-email-jrollins@finestructure.net> References: <1306371680-19441-1-git-send-email-jrollins@finestructure.net> X-BeenThere: notmuch@notmuchmail.org X-Mailman-Version: 2.1.13 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: Thu, 26 May 2011 01:01:36 -0000 This keeps things consistent with notmuch-show, and prevents having to check for the existence of the field pointer for simple string output formats. --- notmuch-reply.c | 12 ++++++------ show-message.c | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/notmuch-reply.c b/notmuch-reply.c index 8c5e76c..7959935 100644 --- a/notmuch-reply.c +++ b/notmuch-reply.c @@ -29,12 +29,12 @@ reply_part (GMimeObject *part, unused (int *part_count)); static const notmuch_show_format_t format_reply = { - NULL, - NULL, NULL, - NULL, NULL, NULL, - NULL, reply_part, NULL, NULL, NULL, - NULL, NULL, - NULL + "", + "", NULL, + "", NULL, "", + "", reply_part, NULL, "", "", + "", "", + "" }; static void diff --git a/show-message.c b/show-message.c index 2ec9eca..32bb860 100644 --- a/show-message.c +++ b/show-message.c @@ -46,7 +46,7 @@ show_message_part (GMimeObject *part, selected = (params->part <= 0 || state->part_count == params->part); if (selected || state->in_zone) { - if (!first && (params->part <= 0 || state->in_zone) && format->part_sep) + if (!first && (params->part <= 0 || state->in_zone)) fputs (format->part_sep, stdout); format->part (part, &(state->part_count)); -- 1.7.4.4