From df71b495533fdd5f21608434dcefb26078ae45be Mon Sep 17 00:00:00 2001 From: Austin Clements Date: Mon, 20 Feb 2012 19:26:27 +1900 Subject: [PATCH] [PATCH v2 5/8] show: Simplify talloc use in format_headers_json --- 1b/6306402ae9d238ac4b536e4a7d20ccfd662023 | 155 ++++++++++++++++++++++ 1 file changed, 155 insertions(+) create mode 100644 1b/6306402ae9d238ac4b536e4a7d20ccfd662023 diff --git a/1b/6306402ae9d238ac4b536e4a7d20ccfd662023 b/1b/6306402ae9d238ac4b536e4a7d20ccfd662023 new file mode 100644 index 000000000..e504486e2 --- /dev/null +++ b/1b/6306402ae9d238ac4b536e4a7d20ccfd662023 @@ -0,0 +1,155 @@ +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 654CF431FCB + for ; Sun, 19 Feb 2012 16:26:37 -0800 (PST) +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 cSE46jWxOSLk for ; + Sun, 19 Feb 2012 16:26:36 -0800 (PST) +Received: from dmz-mailsec-scanner-6.mit.edu (DMZ-MAILSEC-SCANNER-6.MIT.EDU + [18.7.68.35]) + by olra.theworths.org (Postfix) with ESMTP id 4D90E431FAF + for ; Sun, 19 Feb 2012 16:26:36 -0800 (PST) +X-AuditID: 12074423-b7f9c6d0000008c3-f3-4f41933b443c +Received: from mailhub-auth-1.mit.edu ( [18.9.21.35]) + by dmz-mailsec-scanner-6.mit.edu (Symantec Messaging Gateway) with SMTP + id 1C.73.02243.B33914F4; Sun, 19 Feb 2012 19:26:35 -0500 (EST) +Received: from outgoing.mit.edu (OUTGOING-AUTH.MIT.EDU [18.7.22.103]) + by mailhub-auth-1.mit.edu (8.13.8/8.9.2) with ESMTP id q1K0QZR3016443; + Sun, 19 Feb 2012 19:26:35 -0500 +Received: from drake.mit.edu + (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 q1K0QX0r000302 + (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT); + Sun, 19 Feb 2012 19:26:34 -0500 (EST) +Received: from amthrax by drake.mit.edu with local (Exim 4.77) + (envelope-from ) + id 1RzH5N-0001yO-Q3; Sun, 19 Feb 2012 19:26:33 -0500 +From: Austin Clements +To: notmuch@notmuchmail.org +Subject: [PATCH v2 5/8] show: Simplify talloc use in format_headers_json +Date: Sun, 19 Feb 2012 19:26:27 -0500 +Message-Id: <1329697590-7404-6-git-send-email-amdragon@mit.edu> +X-Mailer: git-send-email 1.7.7.3 +In-Reply-To: <1329697590-7404-1-git-send-email-amdragon@mit.edu> +References: <1329240823-7856-1-git-send-email-amdragon@mit.edu> + <1329697590-7404-1-git-send-email-amdragon@mit.edu> +X-Brightmail-Tracker: + H4sIAAAAAAAAA+NgFtrDIsWRmVeSWpSXmKPExsUixCmqrGs92dHf4P1/Q4vrN2cyW7xZOY/V + gcnj8NeFLB7PVt1iDmCK4rJJSc3JLEst0rdL4MpYt/YDa0G7RMW0F/dZGxjvCXcxcnBICJhI + nPtb2sXICWSKSVy4t56ti5GLQ0hgH6PEsbsHWCCcDYwSJ66eYYJw7jNJ/Dm4CcqZzyhx58dv + VpB+NgENiW37lzOC2CIC0hI7784GizMLWEkcvroJzBYW8JA496MBzGYRUJU4/3QWmM0rYC9x + ceZkNog7FCTOrT7HDnIep4CDxOodriBhIYFSiSNPtjBNYORfwMiwilE2JbdKNzcxM6c4NVm3 + ODkxLy+1SNdMLzezRC81pXQTIyiQ2F2UdzD+Oah0iFGAg1GJh1eqzMFfiDWxrLgy9xCjJAeT + kijvukmO/kJ8SfkplRmJxRnxRaU5qcWHGCU4mJVEeBfYA+V4UxIrq1KL8mFS0hwsSuK8Glrv + /IQE0hNLUrNTUwtSi2CyMhwcShK8u0CGChalpqdWpGXmlCCkmTg4QYbzAA2fDVLDW1yQmFuc + mQ6RP8WoKCXOux8kIQCSyCjNg+uFRforRnGgV4R5V4BU8QCTBFz3K6DBTECDeYXsQAaXJCKk + pBoYzV4unZDxanrEl5BLJUuztVKmca6MbLlx9sFevQ8uQqey20Ja/i3UFKlvDlbe4LBaUv7X + lYsKOUz/bTSlzpkufL3eiePKl4ZjN9pD99d+vcS/jTk/R+pPrunqBQ5fWl5GWyn6JX5b9mXv + 41dBS0su8xysUdZ9v7XXhYWz4kd8TI9e0abW5Bk2SizFGYmGWsxFxYkAd0mRt88CAAA= +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: Mon, 20 Feb 2012 00:26:37 -0000 + +Previously there was an unnecessary talloc context. +--- + notmuch-show.c | 32 +++++++++++++++----------------- + 1 files changed, 15 insertions(+), 17 deletions(-) + +diff --git a/notmuch-show.c b/notmuch-show.c +index 209ff45..6259d30 100644 +--- a/notmuch-show.c ++++ b/notmuch-show.c +@@ -291,37 +291,35 @@ format_headers_message_part_text (GMimeMessage *message) + } + + static void +-format_headers_json (GMimeMessage *message) ++format_headers_json (const void *ctx, GMimeMessage *message) + { +- void *ctx = talloc_new (NULL); +- void *ctx_quote = talloc_new (ctx); ++ void *local = talloc_new (ctx); + InternetAddressList *recipients; + const char *recipients_string; + + printf ("%s: %s", +- json_quote_str (ctx_quote, "Subject"), +- json_quote_str (ctx_quote, g_mime_message_get_subject (message))); ++ json_quote_str (local, "Subject"), ++ json_quote_str (local, g_mime_message_get_subject (message))); + printf (", %s: %s", +- json_quote_str (ctx_quote, "From"), +- json_quote_str (ctx_quote, g_mime_message_get_sender (message))); ++ json_quote_str (local, "From"), ++ json_quote_str (local, g_mime_message_get_sender (message))); + recipients = g_mime_message_get_recipients (message, GMIME_RECIPIENT_TYPE_TO); + recipients_string = internet_address_list_to_string (recipients, 0); + if (recipients_string) + printf (", %s: %s", +- json_quote_str (ctx_quote, "To"), +- json_quote_str (ctx_quote, recipients_string)); ++ json_quote_str (local, "To"), ++ json_quote_str (local, recipients_string)); + recipients = g_mime_message_get_recipients (message, GMIME_RECIPIENT_TYPE_CC); + recipients_string = internet_address_list_to_string (recipients, 0); + if (recipients_string) + printf (", %s: %s", +- json_quote_str (ctx_quote, "Cc"), +- json_quote_str (ctx_quote, recipients_string)); ++ json_quote_str (local, "Cc"), ++ json_quote_str (local, recipients_string)); + printf (", %s: %s", +- json_quote_str (ctx_quote, "Date"), +- json_quote_str (ctx_quote, g_mime_message_get_date_as_string (message))); ++ json_quote_str (local, "Date"), ++ json_quote_str (local, g_mime_message_get_date_as_string (message))); + +- talloc_free (ctx_quote); +- talloc_free (ctx); ++ talloc_free (local); + } + + /* Write a MIME text part out to the given stream. +@@ -661,7 +659,7 @@ format_part_json (const void *ctx, mime_node_t *node, notmuch_bool_t first) + format_message_json (ctx, node->envelope_file); + + printf ("\"headers\": {"); +- format_headers_json (GMIME_MESSAGE (node->part)); ++ format_headers_json (ctx, GMIME_MESSAGE (node->part)); + printf ("}"); + + printf (", \"body\": ["); +@@ -749,7 +747,7 @@ format_part_json (const void *ctx, mime_node_t *node, notmuch_bool_t first) + + if (GMIME_IS_MESSAGE (node->part)) { + printf ("\"headers\": {"); +- format_headers_json (GMIME_MESSAGE (node->part)); ++ format_headers_json (local, GMIME_MESSAGE (node->part)); + printf ("}"); + + printf (", \"body\": ["); +-- +1.7.7.3 + -- 2.26.2