+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 654CF431FCB\r
+ for <notmuch@notmuchmail.org>; Sun, 19 Feb 2012 16:26:37 -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 cSE46jWxOSLk for <notmuch@notmuchmail.org>;\r
+ Sun, 19 Feb 2012 16:26:36 -0800 (PST)\r
+Received: from dmz-mailsec-scanner-6.mit.edu (DMZ-MAILSEC-SCANNER-6.MIT.EDU\r
+ [18.7.68.35])\r
+ by olra.theworths.org (Postfix) with ESMTP id 4D90E431FAF\r
+ for <notmuch@notmuchmail.org>; Sun, 19 Feb 2012 16:26:36 -0800 (PST)\r
+X-AuditID: 12074423-b7f9c6d0000008c3-f3-4f41933b443c\r
+Received: from mailhub-auth-1.mit.edu ( [18.9.21.35])\r
+ by dmz-mailsec-scanner-6.mit.edu (Symantec Messaging Gateway) with SMTP\r
+ id 1C.73.02243.B33914F4; Sun, 19 Feb 2012 19:26:35 -0500 (EST)\r
+Received: from outgoing.mit.edu (OUTGOING-AUTH.MIT.EDU [18.7.22.103])\r
+ by mailhub-auth-1.mit.edu (8.13.8/8.9.2) with ESMTP id q1K0QZR3016443; \r
+ Sun, 19 Feb 2012 19:26:35 -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 q1K0QX0r000302\r
+ (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT);\r
+ Sun, 19 Feb 2012 19:26:34 -0500 (EST)\r
+Received: from amthrax by drake.mit.edu with local (Exim 4.77)\r
+ (envelope-from <amthrax@drake.mit.edu>)\r
+ id 1RzH5N-0001yO-Q3; Sun, 19 Feb 2012 19:26:33 -0500\r
+From: Austin Clements <amdragon@MIT.EDU>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH v2 5/8] show: Simplify talloc use in format_headers_json\r
+Date: Sun, 19 Feb 2012 19:26:27 -0500\r
+Message-Id: <1329697590-7404-6-git-send-email-amdragon@mit.edu>\r
+X-Mailer: git-send-email 1.7.7.3\r
+In-Reply-To: <1329697590-7404-1-git-send-email-amdragon@mit.edu>\r
+References: <1329240823-7856-1-git-send-email-amdragon@mit.edu>\r
+ <1329697590-7404-1-git-send-email-amdragon@mit.edu>\r
+X-Brightmail-Tracker:\r
+ H4sIAAAAAAAAA+NgFtrDIsWRmVeSWpSXmKPExsUixCmqrGs92dHf4P1/Q4vrN2cyW7xZOY/V\r
+ gcnj8NeFLB7PVt1iDmCK4rJJSc3JLEst0rdL4MpYt/YDa0G7RMW0F/dZGxjvCXcxcnBICJhI\r
+ nPtb2sXICWSKSVy4t56ti5GLQ0hgH6PEsbsHWCCcDYwSJ66eYYJw7jNJ/Dm4CcqZzyhx58dv\r
+ VpB+NgENiW37lzOC2CIC0hI7784GizMLWEkcvroJzBYW8JA496MBzGYRUJU4/3QWmM0rYC9x\r
+ ceZkNog7FCTOrT7HDnIep4CDxOodriBhIYFSiSNPtjBNYORfwMiwilE2JbdKNzcxM6c4NVm3\r
+ ODkxLy+1SNdMLzezRC81pXQTIyiQ2F2UdzD+Oah0iFGAg1GJh1eqzMFfiDWxrLgy9xCjJAeT\r
+ kijvukmO/kJ8SfkplRmJxRnxRaU5qcWHGCU4mJVEeBfYA+V4UxIrq1KL8mFS0hwsSuK8Glrv\r
+ /IQE0hNLUrNTUwtSi2CyMhwcShK8u0CGChalpqdWpGXmlCCkmTg4QYbzAA2fDVLDW1yQmFuc\r
+ mQ6RP8WoKCXOux8kIQCSyCjNg+uFRforRnGgV4R5V4BU8QCTBFz3K6DBTECDeYXsQAaXJCKk\r
+ pBoYzV4unZDxanrEl5BLJUuztVKmca6MbLlx9sFevQ8uQqey20Ja/i3UFKlvDlbe4LBaUv7X\r
+ lYsKOUz/bTSlzpkufL3eiePKl4ZjN9pD99d+vcS/jTk/R+pPrunqBQ5fWl5GWyn6JX5b9mXv\r
+ 41dBS0su8xysUdZ9v7XXhYWz4kd8TI9e0abW5Bk2SizFGYmGWsxFxYkAd0mRt88CAAA=\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: Mon, 20 Feb 2012 00:26:37 -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
projects / notmuch-archives.git / commitdiff