[PATCH 5/8] show: Simplify talloc use in format_headers_json

diff --git a/fd/5d632d1439b76bcf461b51dbe55bd366aab648 b/fd/5d632d1439b76bcf461b51dbe55bd366aab648
new file mode 100644 (file)
index 0000000..749fa68
--- /dev/null
+++ b/fd/5d632d1439b76bcf461b51dbe55bd366aab648
@@ -0,0 +1,154 @@
+Return-Path: <amthrax@drake.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 9539A429E30\r
+       for <notmuch@notmuchmail.org>; Tue, 14 Feb 2012 09:34:06 -0800 (PST)\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 U52F3E-IA0St for <notmuch@notmuchmail.org>;\r
+       Tue, 14 Feb 2012 09:34:05 -0800 (PST)\r
+Received: from dmz-mailsec-scanner-3.mit.edu (DMZ-MAILSEC-SCANNER-3.MIT.EDU\r
+       [18.9.25.14])\r
+       by olra.theworths.org (Postfix) with ESMTP id 55482431FD6\r
+       for <notmuch@notmuchmail.org>; Tue, 14 Feb 2012 09:34:01 -0800 (PST)\r
+X-AuditID: 1209190e-b7f7c6d0000008c3-64-4f3a9b082ed0\r
+Received: from mailhub-auth-4.mit.edu ( [18.7.62.39])\r
+       by dmz-mailsec-scanner-3.mit.edu (Symantec Messaging Gateway) with SMTP\r
+       id DC.1A.02243.80B9A3F4; Tue, 14 Feb 2012 12:34:00 -0500 (EST)\r
+Received: from outgoing.mit.edu (OUTGOING-AUTH.MIT.EDU [18.7.22.103])\r
+       by mailhub-auth-4.mit.edu (8.13.8/8.9.2) with ESMTP id q1EHY0AA019628; \r
+       Tue, 14 Feb 2012 12:34:00 -0500\r
+Received: from drake.mit.edu\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 q1EHXw6u016514\r
+       (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT);\r
+       Tue, 14 Feb 2012 12:33:59 -0500 (EST)\r
+Received: from amthrax by drake.mit.edu with local (Exim 4.77)\r
+       (envelope-from <amthrax@drake.mit.edu>)\r
+       id 1RxMGM-00027K-Mv; Tue, 14 Feb 2012 12:33:58 -0500\r
+From: Austin Clements <amdragon@MIT.EDU>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH 5/8] show: Simplify talloc use in format_headers_json\r
+Date: Tue, 14 Feb 2012 12:33:40 -0500\r
+Message-Id: <1329240823-7856-6-git-send-email-amdragon@mit.edu>\r
+X-Mailer: git-send-email 1.7.7.3\r
+In-Reply-To: <1329240823-7856-1-git-send-email-amdragon@mit.edu>\r
+References: <1329240823-7856-1-git-send-email-amdragon@mit.edu>\r
+X-Brightmail-Tracker:\r
+ H4sIAAAAAAAAA+NgFjrOIsWRmVeSWpSXmKPExsUixG6nrssx28rf4NQTPYsje2axW1zd2s9u\r
+       cf3mTGYHZo+ds+6yezxbdYvZo+nHYtYA5igum5TUnMyy1CJ9uwSujHVrP7AWtEtUTHtxn7WB\r
+       8Z5wFyMnh4SAicSP+/8YIWwxiQv31rN1MXJxCAnsY5RoWbGFGcLZwChxedZeJgjnPpPEhlu9\r
+       UM58RonTbQ3MIP1sAhoS2/YvB5slIiAtsfPubFYQm1kgXuJI23qwuLCAq8ShucvB4iwCqhIv\r
+       1ywB6uXg4BWwl9jyJg/iDAWJc6vPsYPYnAIOEvv3/QcrFwIquXR3K8sERv4FjAyrGGVTcqt0\r
+       cxMzc4pTk3WLkxPz8lKLdI31cjNL9FJTSjcxgsKLU5JvB+PXg0qHGAU4GJV4eA0sLP2FWBPL\r
+       iitzDzFKcjApifIKz7DyF+JLyk+pzEgszogvKs1JLT7EKMHBrCTCu2k6UI43JbGyKrUoHyYl\r
+       zcGiJM6rpvXOT0ggPbEkNTs1tSC1CCYrw8GhJMGbNAuoUbAoNT21Ii0zpwQhzcTBCTKcB2h4\r
+       MkgNb3FBYm5xZjpE/hSjopQ4rwdIQgAkkVGaB9cLi/9XjOJArwjzBoFU8QBTB1z3K6DBTECD\r
+       t5+2ABlckoiQkmpgXHqb8VprwIxm+UvfzIplZ0jKPRHNX3Xpu7JC243Kgzu2rv33vKmV23r6\r
+       AYHVQepmWwKXmrm+mCIU8GVjq8+jMwYmP+LOJT1bOU2/Yb/U6osLX5QEy4kWtHYdjisP5nu5\r
+       5edM8TLGVG8H+ZdHFi1dr30vMUZ/lcrGJ5EvNRLM62d+3T+xzcszQYmlOCPRUIu5qDgRAFfO\r
+       Q27aAgAA\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: Tue, 14 Feb 2012 17:34:07 -0000\r
+\r
+Previously there was an unnecessary talloc context.\r
+---\r
+ notmuch-show.c |   32 +++++++++++++++-----------------\r
+ 1 files changed, 15 insertions(+), 17 deletions(-)\r
+\r
+diff --git a/notmuch-show.c b/notmuch-show.c\r
+index 209ff45..6259d30 100644\r
+--- a/notmuch-show.c\r
++++ b/notmuch-show.c\r
+@@ -291,37 +291,35 @@ format_headers_message_part_text (GMimeMessage *message)\r
+ }\r
+ \r
+ static void\r
+-format_headers_json (GMimeMessage *message)\r
++format_headers_json (const void *ctx, GMimeMessage *message)\r
+ {\r
+-    void *ctx = talloc_new (NULL);\r
+-    void *ctx_quote = talloc_new (ctx);\r
++    void *local = talloc_new (ctx);\r
+     InternetAddressList *recipients;\r
+     const char *recipients_string;\r
+ \r
+     printf ("%s: %s",\r
+-          json_quote_str (ctx_quote, "Subject"),\r
+-          json_quote_str (ctx_quote, g_mime_message_get_subject (message)));\r
++          json_quote_str (local, "Subject"),\r
++          json_quote_str (local, g_mime_message_get_subject (message)));\r
+     printf (", %s: %s",\r
+-          json_quote_str (ctx_quote, "From"),\r
+-          json_quote_str (ctx_quote, g_mime_message_get_sender (message)));\r
++          json_quote_str (local, "From"),\r
++          json_quote_str (local, g_mime_message_get_sender (message)));\r
+     recipients = g_mime_message_get_recipients (message, GMIME_RECIPIENT_TYPE_TO);\r
+     recipients_string = internet_address_list_to_string (recipients, 0);\r
+     if (recipients_string)\r
+       printf (", %s: %s",\r
+-              json_quote_str (ctx_quote, "To"),\r
+-              json_quote_str (ctx_quote, recipients_string));\r
++              json_quote_str (local, "To"),\r
++              json_quote_str (local, recipients_string));\r
+     recipients = g_mime_message_get_recipients (message, GMIME_RECIPIENT_TYPE_CC);\r
+     recipients_string = internet_address_list_to_string (recipients, 0);\r
+     if (recipients_string)\r
+       printf (", %s: %s",\r
+-              json_quote_str (ctx_quote, "Cc"),\r
+-              json_quote_str (ctx_quote, recipients_string));\r
++              json_quote_str (local, "Cc"),\r
++              json_quote_str (local, recipients_string));\r
+     printf (", %s: %s",\r
+-          json_quote_str (ctx_quote, "Date"),\r
+-          json_quote_str (ctx_quote, g_mime_message_get_date_as_string (message)));\r
++          json_quote_str (local, "Date"),\r
++          json_quote_str (local, g_mime_message_get_date_as_string (message)));\r
+ \r
+-    talloc_free (ctx_quote);\r
+-    talloc_free (ctx);\r
++    talloc_free (local);\r
+ }\r
+ \r
+ /* Write a MIME text part out to the given stream.\r
+@@ -661,7 +659,7 @@ format_part_json (const void *ctx, mime_node_t *node, notmuch_bool_t first)\r
+       format_message_json (ctx, node->envelope_file);\r
+ \r
+       printf ("\"headers\": {");\r
+-      format_headers_json (GMIME_MESSAGE (node->part));\r
++      format_headers_json (ctx, GMIME_MESSAGE (node->part));\r
+       printf ("}");\r
+ \r
+       printf (", \"body\": [");\r
+@@ -749,7 +747,7 @@ format_part_json (const void *ctx, mime_node_t *node, notmuch_bool_t first)\r
+ \r
+     if (GMIME_IS_MESSAGE (node->part)) {\r
+       printf ("\"headers\": {");\r
+-      format_headers_json (GMIME_MESSAGE (node->part));\r
++      format_headers_json (local, GMIME_MESSAGE (node->part));\r
+       printf ("}");\r
+ \r
+       printf (", \"body\": [");\r
+-- \r
+1.7.7.3\r
+\r