1b/6306402ae9d238ac4b536e4a7d20ccfd662023

   1 Return-Path: <amthrax@drake.mit.edu>\r
   2 X-Original-To: notmuch@notmuchmail.org\r
   3 Delivered-To: notmuch@notmuchmail.org\r
   4 Received: from localhost (localhost [127.0.0.1])\r
   5         by olra.theworths.org (Postfix) with ESMTP id 654CF431FCB\r
   6         for <notmuch@notmuchmail.org>; Sun, 19 Feb 2012 16:26:37 -0800 (PST)\r
   7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
   8 X-Spam-Flag: NO\r
   9 X-Spam-Score: -0.7\r
  10 X-Spam-Level: \r
  11 X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5\r
  12         tests=[RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled\r
  13 Received: from olra.theworths.org ([127.0.0.1])\r
  14         by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
  15         with ESMTP id cSE46jWxOSLk for <notmuch@notmuchmail.org>;\r
  16         Sun, 19 Feb 2012 16:26:36 -0800 (PST)\r
  17 Received: from dmz-mailsec-scanner-6.mit.edu (DMZ-MAILSEC-SCANNER-6.MIT.EDU\r
  18         [18.7.68.35])\r
  19         by olra.theworths.org (Postfix) with ESMTP id 4D90E431FAF\r
  20         for <notmuch@notmuchmail.org>; Sun, 19 Feb 2012 16:26:36 -0800 (PST)\r
  21 X-AuditID: 12074423-b7f9c6d0000008c3-f3-4f41933b443c\r
  22 Received: from mailhub-auth-1.mit.edu ( [18.9.21.35])\r
  23         by dmz-mailsec-scanner-6.mit.edu (Symantec Messaging Gateway) with SMTP\r
  24         id 1C.73.02243.B33914F4; Sun, 19 Feb 2012 19:26:35 -0500 (EST)\r
  25 Received: from outgoing.mit.edu (OUTGOING-AUTH.MIT.EDU [18.7.22.103])\r
  26         by mailhub-auth-1.mit.edu (8.13.8/8.9.2) with ESMTP id q1K0QZR3016443; \r
  27         Sun, 19 Feb 2012 19:26:35 -0500\r
  28 Received: from drake.mit.edu\r
  29         (209-6-116-242.c3-0.arl-ubr1.sbo-arl.ma.cable.rcn.com\r
  30         [209.6.116.242]) (authenticated bits=0)\r
  31         (User authenticated as amdragon@ATHENA.MIT.EDU)\r
  32         by outgoing.mit.edu (8.13.6/8.12.4) with ESMTP id q1K0QX0r000302\r
  33         (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT);\r
  34         Sun, 19 Feb 2012 19:26:34 -0500 (EST)\r
  35 Received: from amthrax by drake.mit.edu with local (Exim 4.77)\r
  36         (envelope-from <amthrax@drake.mit.edu>)\r
  37         id 1RzH5N-0001yO-Q3; Sun, 19 Feb 2012 19:26:33 -0500\r
  38 From: Austin Clements <amdragon@MIT.EDU>\r
  39 To: notmuch@notmuchmail.org\r
  40 Subject: [PATCH v2 5/8] show: Simplify talloc use in format_headers_json\r
  41 Date: Sun, 19 Feb 2012 19:26:27 -0500\r
  42 Message-Id: <1329697590-7404-6-git-send-email-amdragon@mit.edu>\r
  43 X-Mailer: git-send-email 1.7.7.3\r
  44 In-Reply-To: <1329697590-7404-1-git-send-email-amdragon@mit.edu>\r
  45 References: <1329240823-7856-1-git-send-email-amdragon@mit.edu>\r
  46         <1329697590-7404-1-git-send-email-amdragon@mit.edu>\r
  47 X-Brightmail-Tracker:\r
  48  H4sIAAAAAAAAA+NgFtrDIsWRmVeSWpSXmKPExsUixCmqrGs92dHf4P1/Q4vrN2cyW7xZOY/V\r
  49         gcnj8NeFLB7PVt1iDmCK4rJJSc3JLEst0rdL4MpYt/YDa0G7RMW0F/dZGxjvCXcxcnBICJhI\r
  50         nPtb2sXICWSKSVy4t56ti5GLQ0hgH6PEsbsHWCCcDYwSJ66eYYJw7jNJ/Dm4CcqZzyhx58dv\r
  51         VpB+NgENiW37lzOC2CIC0hI7784GizMLWEkcvroJzBYW8JA496MBzGYRUJU4/3QWmM0rYC9x\r
  52         ceZkNog7FCTOrT7HDnIep4CDxOodriBhIYFSiSNPtjBNYORfwMiwilE2JbdKNzcxM6c4NVm3\r
  53         ODkxLy+1SNdMLzezRC81pXQTIyiQ2F2UdzD+Oah0iFGAg1GJh1eqzMFfiDWxrLgy9xCjJAeT\r
  54         kijvukmO/kJ8SfkplRmJxRnxRaU5qcWHGCU4mJVEeBfYA+V4UxIrq1KL8mFS0hwsSuK8Glrv\r
  55         /IQE0hNLUrNTUwtSi2CyMhwcShK8u0CGChalpqdWpGXmlCCkmTg4QYbzAA2fDVLDW1yQmFuc\r
  56         mQ6RP8WoKCXOux8kIQCSyCjNg+uFRforRnGgV4R5V4BU8QCTBFz3K6DBTECDeYXsQAaXJCKk\r
  57         pBoYzV4unZDxanrEl5BLJUuztVKmca6MbLlx9sFevQ8uQqey20Ja/i3UFKlvDlbe4LBaUv7X\r
  58         lYsKOUz/bTSlzpkufL3eiePKl4ZjN9pD99d+vcS/jTk/R+pPrunqBQ5fWl5GWyn6JX5b9mXv\r
  59         41dBS0su8xysUdZ9v7XXhYWz4kd8TI9e0abW5Bk2SizFGYmGWsxFxYkAd0mRt88CAAA=\r
  60 Cc: tomi.ollila@iki.fi\r
  61 X-BeenThere: notmuch@notmuchmail.org\r
  62 X-Mailman-Version: 2.1.13\r
  63 Precedence: list\r
  64 List-Id: "Use and development of the notmuch mail system."\r
  65         <notmuch.notmuchmail.org>\r
  66 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
  67         <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
  68 List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
  69 List-Post: <mailto:notmuch@notmuchmail.org>\r
  70 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
  71 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
  72         <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
  73 X-List-Received-Date: Mon, 20 Feb 2012 00:26:37 -0000\r
  74 \r
  75 Previously there was an unnecessary talloc context.\r
  76 ---\r
  77  notmuch-show.c |   32 +++++++++++++++-----------------\r
  78  1 files changed, 15 insertions(+), 17 deletions(-)\r
  79 \r
  80 diff --git a/notmuch-show.c b/notmuch-show.c\r
  81 index 209ff45..6259d30 100644\r
  82 --- a/notmuch-show.c\r
  83 +++ b/notmuch-show.c\r
  84 @@ -291,37 +291,35 @@ format_headers_message_part_text (GMimeMessage *message)\r
  85  }\r
  86  \r
  87  static void\r
  88 -format_headers_json (GMimeMessage *message)\r
  89 +format_headers_json (const void *ctx, GMimeMessage *message)\r
  90  {\r
  91 -    void *ctx = talloc_new (NULL);\r
  92 -    void *ctx_quote = talloc_new (ctx);\r
  93 +    void *local = talloc_new (ctx);\r
  94      InternetAddressList *recipients;\r
  95      const char *recipients_string;\r
  96  \r
  97      printf ("%s: %s",\r
  98 -           json_quote_str (ctx_quote, "Subject"),\r
  99 -           json_quote_str (ctx_quote, g_mime_message_get_subject (message)));\r
 100 +           json_quote_str (local, "Subject"),\r
 101 +           json_quote_str (local, g_mime_message_get_subject (message)));\r
 102      printf (", %s: %s",\r
 103 -           json_quote_str (ctx_quote, "From"),\r
 104 -           json_quote_str (ctx_quote, g_mime_message_get_sender (message)));\r
 105 +           json_quote_str (local, "From"),\r
 106 +           json_quote_str (local, g_mime_message_get_sender (message)));\r
 107      recipients = g_mime_message_get_recipients (message, GMIME_RECIPIENT_TYPE_TO);\r
 108      recipients_string = internet_address_list_to_string (recipients, 0);\r
 109      if (recipients_string)\r
 110         printf (", %s: %s",\r
 111 -               json_quote_str (ctx_quote, "To"),\r
 112 -               json_quote_str (ctx_quote, recipients_string));\r
 113 +               json_quote_str (local, "To"),\r
 114 +               json_quote_str (local, recipients_string));\r
 115      recipients = g_mime_message_get_recipients (message, GMIME_RECIPIENT_TYPE_CC);\r
 116      recipients_string = internet_address_list_to_string (recipients, 0);\r
 117      if (recipients_string)\r
 118         printf (", %s: %s",\r
 119 -               json_quote_str (ctx_quote, "Cc"),\r
 120 -               json_quote_str (ctx_quote, recipients_string));\r
 121 +               json_quote_str (local, "Cc"),\r
 122 +               json_quote_str (local, recipients_string));\r
 123      printf (", %s: %s",\r
 124 -           json_quote_str (ctx_quote, "Date"),\r
 125 -           json_quote_str (ctx_quote, g_mime_message_get_date_as_string (message)));\r
 126 +           json_quote_str (local, "Date"),\r
 127 +           json_quote_str (local, g_mime_message_get_date_as_string (message)));\r
 128  \r
 129 -    talloc_free (ctx_quote);\r
 130 -    talloc_free (ctx);\r
 131 +    talloc_free (local);\r
 132  }\r
 133  \r
 134  /* Write a MIME text part out to the given stream.\r
 135 @@ -661,7 +659,7 @@ format_part_json (const void *ctx, mime_node_t *node, notmuch_bool_t first)\r
 136         format_message_json (ctx, node->envelope_file);\r
 137  \r
 138         printf ("\"headers\": {");\r
 139 -       format_headers_json (GMIME_MESSAGE (node->part));\r
 140 +       format_headers_json (ctx, GMIME_MESSAGE (node->part));\r
 141         printf ("}");\r
 142  \r
 143         printf (", \"body\": [");\r
 144 @@ -749,7 +747,7 @@ format_part_json (const void *ctx, mime_node_t *node, notmuch_bool_t first)\r
 145  \r
 146      if (GMIME_IS_MESSAGE (node->part)) {\r
 147         printf ("\"headers\": {");\r
 148 -       format_headers_json (GMIME_MESSAGE (node->part));\r
 149 +       format_headers_json (local, GMIME_MESSAGE (node->part));\r
 150         printf ("}");\r
 151  \r
 152         printf (", \"body\": [");\r
 153 -- \r
 154 1.7.7.3\r
 155 \r