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