From: Austin Clements Date: Fri, 3 Aug 2012 01:14:59 +0000 (+2000) Subject: [PATCH v3 13/13] show: Remove now unused fields from notmuch_show_format X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=3dfd1cae2300d0c979546059898042de3c6687a3;p=notmuch-archives.git [PATCH v3 13/13] show: Remove now unused fields from notmuch_show_format --- diff --git a/03/0db048651b65c49c1bbd8c7e80d50b0a4b53b7 b/03/0db048651b65c49c1bbd8c7e80d50b0a4b53b7 new file mode 100644 index 000000000..0f2cbd7dc --- /dev/null +++ b/03/0db048651b65c49c1bbd8c7e80d50b0a4b53b7 @@ -0,0 +1,119 @@ +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 24A8B429E37 + for ; Thu, 2 Aug 2012 18:15:33 -0700 (PDT) +X-Virus-Scanned: Debian amavisd-new at olra.theworths.org +X-Spam-Flag: NO +X-Spam-Score: -0.7 +X-Spam-Level: +X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5 + tests=[RCVD_IN_DNSWL_LOW=-0.7] 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 tXou15h-03tN for ; + Thu, 2 Aug 2012 18:15:32 -0700 (PDT) +Received: from dmz-mailsec-scanner-2.mit.edu (DMZ-MAILSEC-SCANNER-2.MIT.EDU + [18.9.25.13]) + by olra.theworths.org (Postfix) with ESMTP id BA64E429E41 + for ; Thu, 2 Aug 2012 18:15:11 -0700 (PDT) +X-AuditID: 1209190d-b7fd56d000000933-db-501b261f7f67 +Received: from mailhub-auth-3.mit.edu ( [18.9.21.43]) + by dmz-mailsec-scanner-2.mit.edu (Symantec Messaging Gateway) with SMTP + id 1A.7E.02355.F162B105; Thu, 2 Aug 2012 21:15:11 -0400 (EDT) +Received: from outgoing.mit.edu (OUTGOING-AUTH.MIT.EDU [18.7.22.103]) + by mailhub-auth-3.mit.edu (8.13.8/8.9.2) with ESMTP id q731FBJB008956; + Thu, 2 Aug 2012 21:15:11 -0400 +Received: from drake.dyndns.org + (209-6-116-242.c3-0.arl-ubr1.sbo-arl.ma.cable.rcn.com + [209.6.116.242]) (authenticated bits=0) + (User authenticated as amdragon@ATHENA.MIT.EDU) + by outgoing.mit.edu (8.13.6/8.12.4) with ESMTP id q731F4cf002796 + (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT); + Thu, 2 Aug 2012 21:15:05 -0400 (EDT) +Received: from amthrax by drake.dyndns.org with local (Exim 4.77) + (envelope-from ) + id 1Sx6To-0003wg-K7; Thu, 02 Aug 2012 21:15:04 -0400 +From: Austin Clements +To: notmuch@notmuchmail.org +Subject: [PATCH v3 13/13] show: Remove now unused fields from + notmuch_show_format +Date: Thu, 2 Aug 2012 21:14:59 -0400 +Message-Id: <1343956499-14543-14-git-send-email-amdragon@mit.edu> +X-Mailer: git-send-email 1.7.10 +In-Reply-To: <1343956499-14543-1-git-send-email-amdragon@mit.edu> +References: <1343956499-14543-1-git-send-email-amdragon@mit.edu> +X-Brightmail-Tracker: + H4sIAAAAAAAAA+NgFjrKIsWRmVeSWpSXmKPExsUixCmqrSuvJh1gcHyxusXquTwW12/OZLZ4 + s3IeqwOzx85Zd9k9Dn9dyOLxbNUt5gDmKC6blNSczLLUIn27BK6MJac3sxcs4q6YMOkNWwPj + b44uRk4OCQETicMvJrFD2GISF+6tZ+ti5OIQEtjHKLF3yTxGCGc9o8SnX/eZQaqEBB4ySax+ + GgiRmMsosWniWrAEm4CGxLb9yxlBbBEBaYmdd2ezgtjMAnESW6b8B4sLCwRKnN+8mgXEZhFQ + lWjatIepi5GDg1fAUeLrmlyIK+Qlnt7vYwOxOYHCr9++YoTY6yCxvK2bdQIj/wJGhlWMsim5 + Vbq5iZk5xanJusXJiXl5qUW6Rnq5mSV6qSmlmxjBoSXJu4Px3UGlQ4wCHIxKPLwmktIBQqyJ + ZcWVuYcYJTmYlER5mZWAQnxJ+SmVGYnFGfFFpTmpxYcYJTiYlUR4q5ZIBQjxpiRWVqUW5cOk + pDlYlMR5r6Tc9BcSSE8sSc1OTS1ILYLJynBwKEnwBqsCDRUsSk1PrUjLzClBSDNxcIIM5wEa + bg9Sw1tckJhbnJkOkT/FqCglzpsOkhAASWSU5sH1wmL/FaM40CvCvF4gVTzAtAHX/QpoMBPQ + YDszkKuLSxIRUlINjGfd/rHE5iT2ODILbfrmfXRN9c+1K3+f6prW3jO9JvGZ2qMVWe7+znbn + 2J6812dJaRKwz44tOlF3Qi/HuVhE0kjNNU88pHnKgXmmZoE2z1pyhf562e/QWJ35svdr+zo5 + tkkXubJnqR+9c+p6kHPbrszTMztfPxMS/T0z7uyL7F2zE+Tn5B36q8RSnJFoqMVcVJwIAL/X + k2fYAgAA +Cc: tomi.ollila@iki.fi +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: Fri, 03 Aug 2012 01:15:33 -0000 + +The message_set_{begin,sep,end} and null_message fields are no longer +used because we now use the structure printer provided by the format. +--- + notmuch-client.h | 4 ---- + notmuch-show.c | 4 ---- + 2 files changed, 8 deletions(-) + +diff --git a/notmuch-client.h b/notmuch-client.h +index b11caff..ae9344b 100644 +--- a/notmuch-client.h ++++ b/notmuch-client.h +@@ -71,13 +71,9 @@ struct notmuch_show_params; + + typedef struct notmuch_show_format { + struct sprinter *(*new_sprinter) (const void *ctx, FILE *stream); +- const char *message_set_start; + notmuch_status_t (*part) (const void *ctx, struct sprinter *sprinter, + struct mime_node *node, int indent, + const struct notmuch_show_params *params); +- const char *message_set_sep; +- const char *message_set_end; +- const char *null_message; + } notmuch_show_format_t; + + typedef struct notmuch_crypto { +diff --git a/notmuch-show.c b/notmuch-show.c +index 89bf2e7..3556293 100644 +--- a/notmuch-show.c ++++ b/notmuch-show.c +@@ -37,11 +37,7 @@ format_part_json_entry (const void *ctx, sprinter_t *sp, mime_node_t *node, + + static const notmuch_show_format_t format_json = { + .new_sprinter = sprinter_json_create, +- .message_set_start = "[", + .part = format_part_json_entry, +- .message_set_sep = ", ", +- .message_set_end = "]", +- .null_message = "null" + }; + + static notmuch_status_t +-- +1.7.10 +