[PATCH v2 13/13] show: Remove now unused fields from notmuch_show_format

diff --git a/b4/5d48478de8182ba92763bba21217f4caffff88 b/b4/5d48478de8182ba92763bba21217f4caffff88
new file mode 100644 (file)
index 0000000..700e0b1
--- /dev/null
+++ b/b4/5d48478de8182ba92763bba21217f4caffff88
@@ -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 E4146431FB6\r
+       for <notmuch@notmuchmail.org>; Fri, 27 Jul 2012 21:29:43 -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 sVHH2EHx5E33 for <notmuch@notmuchmail.org>;\r
+       Fri, 27 Jul 2012 21:29:42 -0700 (PDT)\r
+Received: from dmz-mailsec-scanner-7.mit.edu (DMZ-MAILSEC-SCANNER-7.MIT.EDU\r
+       [18.7.68.36])\r
+       by olra.theworths.org (Postfix) with ESMTP id 71BA1431FD0\r
+       for <notmuch@notmuchmail.org>; Fri, 27 Jul 2012 21:29:28 -0700 (PDT)\r
+X-AuditID: 12074424-b7f2a6d0000008bf-b3-50136aa88a31\r
+Received: from mailhub-auth-2.mit.edu ( [18.7.62.36])\r
+       by dmz-mailsec-scanner-7.mit.edu (Symantec Messaging Gateway) with SMTP\r
+       id C4.1B.02239.8AA63105; Sat, 28 Jul 2012 00:29:28 -0400 (EDT)\r
+Received: from outgoing.mit.edu (OUTGOING-AUTH.MIT.EDU [18.7.22.103])\r
+       by mailhub-auth-2.mit.edu (8.13.8/8.9.2) with ESMTP id q6S4TSCe002964; \r
+       Sat, 28 Jul 2012 00:29:28 -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 q6S4TLfb027364\r
+       (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT);\r
+       Sat, 28 Jul 2012 00:29:22 -0400 (EDT)\r
+Received: from amthrax by drake.dyndns.org with local (Exim 4.77)\r
+       (envelope-from <amdragon@mit.edu>)\r
+       id 1SuyeX-0002XJ-01; Sat, 28 Jul 2012 00:29:20 -0400\r
+From: Austin Clements <amdragon@MIT.EDU>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH v2 13/13] show: Remove now unused fields from\r
+       notmuch_show_format\r
+Date: Sat, 28 Jul 2012 00:29:14 -0400\r
+Message-Id: <1343449754-9010-14-git-send-email-amdragon@mit.edu>\r
+X-Mailer: git-send-email 1.7.10\r
+In-Reply-To: <1343449754-9010-1-git-send-email-amdragon@mit.edu>\r
+References: <1343449754-9010-1-git-send-email-amdragon@mit.edu>\r
+X-Brightmail-Tracker:\r
+ H4sIAAAAAAAAA+NgFrrAIsWRmVeSWpSXmKPExsUixG6norsiSzjA4HmTgMXehnZGi9VzeSyu\r
+       35zJbPFm5TxWBxaPnbPusnss3rSfzePw14UsHs9W3WIOYInisklJzcksSy3St0vgypj5/gxT\r
+       wQzuiu4/n9kbGD9zdDFyckgImEhMe7uAGcIWk7hwbz1bFyMXh5DAPkaJ1ncnmSGcDYwSC940\r
+       skA4j5gktu74AFU2l1FiReNqdpB+NgENiW37lzOC2CIC0hI7785m7WLk4GAWyJN4vFYCJCws\r
+       ECixY8ZxNhCbRUBVomtDGxOIzSvgIPGkazcrxBnyEk/v94HVcALFN7/8AHaekIC9xO7JG1gn\r
+       MPIvYGRYxSibklulm5uYmVOcmqxbnJyYl5dapGuul5tZopeaUrqJERxwLio7GJsPKR1iFOBg\r
+       VOLhPXVFKECINbGsuDL3EKMkB5OSKG9UuHCAEF9SfkplRmJxRnxRaU5q8SFGCQ5mJRHenYJA\r
+       Od6UxMqq1KJ8mJQ0B4uSOO/1lJv+QgLpiSWp2ampBalFMFkZDg4lCd7tmUCNgkWp6akVaZk5\r
+       JQhpJg5OkOE8QMPXgNTwFhck5hZnpkPkTzEqSonzPgZJCIAkMkrz4HphCeEVozjQK8K810Cq\r
+       eIDJBK77FdBgJqDBFtFCIINLEhFSUg2Mu1rTbIy/Owt8/GFamRrQpsdwSKlEjl225/9jPbWE\r
+       2y0O4lZ+hd396wLTJtv/v5zLKTsx/q6pcM716znrIvN/Zr5Z/HvlqppnJp0lXleexkj7sApa\r
+       F4nZV8Ts+PNePcTazfLtnT83WK9t7eaa9ZRF4KvH0d0Lflz7VfXju0jQ+XMzf7+083JRYinO\r
+       SDTUYi4qTgQAACgfkOMCAAA=\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: Sat, 28 Jul 2012 04:29:44 -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 21c3231..de31aa1 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
+     sprinter_t *(*new_sprinter) (const void *ctx, FILE *stream);\r
+-    const char *message_set_start;\r
+     notmuch_status_t (*part) (const void *ctx, sprinter_t *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