From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from localhost (localhost [127.0.0.1]) by olra.theworths.org (Postfix) with ESMTP id 9539A429E30 for ; Tue, 14 Feb 2012 09:34:06 -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 U52F3E-IA0St for ; Tue, 14 Feb 2012 09:34:05 -0800 (PST) Received: from dmz-mailsec-scanner-3.mit.edu (DMZ-MAILSEC-SCANNER-3.MIT.EDU [18.9.25.14]) by olra.theworths.org (Postfix) with ESMTP id 55482431FD6 for ; Tue, 14 Feb 2012 09:34:01 -0800 (PST) X-AuditID: 1209190e-b7f7c6d0000008c3-64-4f3a9b082ed0 Received: from mailhub-auth-4.mit.edu ( [18.7.62.39]) by dmz-mailsec-scanner-3.mit.edu (Symantec Messaging Gateway) with SMTP id DC.1A.02243.80B9A3F4; Tue, 14 Feb 2012 12:34:00 -0500 (EST) Received: from outgoing.mit.edu (OUTGOING-AUTH.MIT.EDU [18.7.22.103]) by mailhub-auth-4.mit.edu (8.13.8/8.9.2) with ESMTP id q1EHY0AA019628; Tue, 14 Feb 2012 12:34:00 -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 q1EHXw6u016514 (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT); Tue, 14 Feb 2012 12:33:59 -0500 (EST) Received: from amthrax by drake.mit.edu with local (Exim 4.77) (envelope-from ) id 1RxMGM-00027K-Mv; Tue, 14 Feb 2012 12:33:58 -0500 From: Austin Clements To: notmuch@notmuchmail.org Subject: [PATCH 5/8] show: Simplify talloc use in format_headers_json Date: Tue, 14 Feb 2012 12:33:40 -0500 Message-Id: <1329240823-7856-6-git-send-email-amdragon@mit.edu> X-Mailer: git-send-email 1.7.7.3 In-Reply-To: <1329240823-7856-1-git-send-email-amdragon@mit.edu> References: <1329240823-7856-1-git-send-email-amdragon@mit.edu> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFjrOIsWRmVeSWpSXmKPExsUixG6nrssx28rf4NQTPYsje2axW1zd2s9u cf3mTGYHZo+ds+6yezxbdYvZo+nHYtYA5igum5TUnMyy1CJ9uwSujHVrP7AWtEtUTHtxn7WB 8Z5wFyMnh4SAicSP+/8YIWwxiQv31rN1MXJxCAnsY5RoWbGFGcLZwChxedZeJgjnPpPEhlu9 UM58RonTbQ3MIP1sAhoS2/YvB5slIiAtsfPubFYQm1kgXuJI23qwuLCAq8ShucvB4iwCqhIv 1ywB6uXg4BWwl9jyJg/iDAWJc6vPsYPYnAIOEvv3/QcrFwIquXR3K8sERv4FjAyrGGVTcqt0 cxMzc4pTk3WLkxPz8lKLdI31cjNL9FJTSjcxgsKLU5JvB+PXg0qHGAU4GJV4eA0sLP2FWBPL iitzDzFKcjApifIKz7DyF+JLyk+pzEgszogvKs1JLT7EKMHBrCTCu2k6UI43JbGyKrUoHyYl zcGiJM6rpvXOT0ggPbEkNTs1tSC1CCYrw8GhJMGbNAuoUbAoNT21Ii0zpwQhzcTBCTKcB2h4 MkgNb3FBYm5xZjpE/hSjopQ4rwdIQgAkkVGaB9cLi/9XjOJArwjzBoFU8QBTB1z3K6DBTECD t5+2ABlckoiQkmpgXHqb8VprwIxm+UvfzIplZ0jKPRHNX3Xpu7JC243Kgzu2rv33vKmV23r6 AYHVQepmWwKXmrm+mCIU8GVjq8+jMwYmP+LOJT1bOU2/Yb/U6osLX5QEy4kWtHYdjisP5nu5 5edM8TLGVG8H+ZdHFi1dr30vMUZ/lcrGJ5EvNRLM62d+3T+xzcszQYmlOCPRUIu5qDgRAFfO Q27aAgAA 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: Tue, 14 Feb 2012 17:34:07 -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