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