--- /dev/null
+Return-Path: <amdragon@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 CCE45429E4D\r
+ for <notmuch@notmuchmail.org>; Thu, 2 Aug 2012 18:15:12 -0700 (PDT)\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 L2tW2ssioUTB for <notmuch@notmuchmail.org>;\r
+ Thu, 2 Aug 2012 18:15:10 -0700 (PDT)\r
+Received: from dmz-mailsec-scanner-8.mit.edu (DMZ-MAILSEC-SCANNER-8.MIT.EDU\r
+ [18.7.68.37])\r
+ by olra.theworths.org (Postfix) with ESMTP id 56A2C431E84\r
+ for <notmuch@notmuchmail.org>; Thu, 2 Aug 2012 18:15:08 -0700 (PDT)\r
+X-AuditID: 12074425-b7f9b6d0000008c4-bd-501b261beb97\r
+Received: from mailhub-auth-2.mit.edu ( [18.7.62.36])\r
+ by dmz-mailsec-scanner-8.mit.edu (Symantec Messaging Gateway) with SMTP\r
+ id 29.BD.02244.B162B105; Thu, 2 Aug 2012 21:15:07 -0400 (EDT)\r
+Received: from outgoing.mit.edu (OUTGOING-AUTH.MIT.EDU [18.7.22.103])\r
+ by mailhub-auth-2.mit.edu (8.13.8/8.9.2) with ESMTP id q731F6Io019971; \r
+ Thu, 2 Aug 2012 21:15:06 -0400\r
+Received: from drake.dyndns.org\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 q731F4oF002789\r
+ (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT);\r
+ Thu, 2 Aug 2012 21:15:05 -0400 (EDT)\r
+Received: from amthrax by drake.dyndns.org with local (Exim 4.77)\r
+ (envelope-from <amdragon@mit.edu>)\r
+ id 1Sx6To-0003wP-Ac; Thu, 02 Aug 2012 21:15:04 -0400\r
+From: Austin Clements <amdragon@MIT.EDU>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH v3 07/13] show: Convert format_headers_json to use sprinter\r
+Date: Thu, 2 Aug 2012 21:14:53 -0400\r
+Message-Id: <1343956499-14543-8-git-send-email-amdragon@mit.edu>\r
+X-Mailer: git-send-email 1.7.10\r
+In-Reply-To: <1343956499-14543-1-git-send-email-amdragon@mit.edu>\r
+References: <1343956499-14543-1-git-send-email-amdragon@mit.edu>\r
+X-Brightmail-Tracker:\r
+ H4sIAAAAAAAAA+NgFjrKIsWRmVeSWpSXmKPExsUixG6noiutJh1gcK5fy2L1XB6L6zdnMlu8\r
+ WTmP1YHZY+esu+weh78uZPF4tuoWcwBzFJdNSmpOZllqkb5dAlfG1l8aBW9VK/5eX8HWwPhW\r
+ rouRk0NCwETiR28XI4QtJnHh3nq2LkYuDiGBfYwS31pnQznrGSXuv7vAAuE8ZJLYsKOFHcKZ\r
+ yyix/fsOFpB+NgENiW37l4PNEhGQlth5dzYriM0sECexZcp/sLiwgLfEubnTmboYOThYBFQl\r
+ Xr91AQnzCjhInJl3hxXiDHmJp/f72EBsTgFHoJJXYK1CQDXL27pZJzDyL2BkWMUom5JbpZub\r
+ mJlTnJqsW5ycmJeXWqRroZebWaKXmlK6iREcWi6qOxgnHFI6xCjAwajEw2skKR0gxJpYVlyZ\r
+ e4hRkoNJSZSXWQkoxJeUn1KZkVicEV9UmpNafIhRgoNZSYS3aolUgBBvSmJlVWpRPkxKmoNF\r
+ SZz3RspNfyGB9MSS1OzU1ILUIpisDAeHkgSvrCrQUMGi1PTUirTMnBKENBMHJ8hwHqDh9iA1\r
+ vMUFibnFmekQ+VOMilLivOwgCQGQREZpHlwvLPZfMYoDvSLMe0EFqIoHmDbgul8BDWYCGmxn\r
+ BnJ1cUkiQkqqgdHqsW9IDecdpXeXxd5nvzI9GBIxq3+K0/ymFMWZrY9uPjpxMbmJTzTPTfHB\r
+ 9u86Vh4bTxTcWsjgdsdBfWtxU+em5pc1542kJRtOyeZY2eXOe1NreNSXd5qU6hG+Jr1HS7tP\r
+ Pnu43lb/oN/z/DTz6yuqrx7yn24zR6L9zr+VIn9LNC25jt1K6lNiKc5INNRiLipOBADsO7D8\r
+ 2AIAAA==\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: Fri, 03 Aug 2012 01:15:13 -0000\r
+\r
+This no longer requires a talloc context (not that it really did\r
+before since it didn't return anything), so we remove its context\r
+argument.\r
+---\r
+ notmuch-client.h | 3 ++-\r
+ notmuch-reply.c | 2 +-\r
+ notmuch-show.c | 58 ++++++++++++++++++++++++++----------------------------\r
+ 3 files changed, 31 insertions(+), 32 deletions(-)\r
+\r
+diff --git a/notmuch-client.h b/notmuch-client.h\r
+index 112574c..b11caff 100644\r
+--- a/notmuch-client.h\r
++++ b/notmuch-client.h\r
+@@ -183,7 +183,8 @@ format_part_json (const void *ctx, struct sprinter *sp, mime_node_t *node,\r
+ notmuch_bool_t first, notmuch_bool_t output_body);\r
+ \r
+ void\r
+-format_headers_json (const void *ctx, GMimeMessage *message, notmuch_bool_t reply);\r
++format_headers_json (struct sprinter *sp, GMimeMessage *message,\r
++ notmuch_bool_t reply);\r
+ \r
+ typedef enum {\r
+ NOTMUCH_SHOW_TEXT_PART_REPLY = 1 << 0,\r
+diff --git a/notmuch-reply.c b/notmuch-reply.c\r
+index 07d4452..fa6665f 100644\r
+--- a/notmuch-reply.c\r
++++ b/notmuch-reply.c\r
+@@ -617,7 +617,7 @@ notmuch_reply_format_json(void *ctx,\r
+ \r
+ /* The headers of the reply message we've created */\r
+ printf ("{\"reply-headers\": ");\r
+- format_headers_json (ctx, reply, TRUE);\r
++ format_headers_json (sp, reply, TRUE);\r
+ g_object_unref (G_OBJECT (reply));\r
+ reply = NULL;\r
+ \r
+diff --git a/notmuch-show.c b/notmuch-show.c\r
+index b258f65..9852119 100644\r
+--- a/notmuch-show.c\r
++++ b/notmuch-show.c\r
+@@ -199,48 +199,46 @@ _is_from_line (const char *line)\r
+ }\r
+ \r
+ void\r
+-format_headers_json (const void *ctx, GMimeMessage *message, notmuch_bool_t reply)\r
++format_headers_json (sprinter_t *sp, GMimeMessage *message,\r
++ notmuch_bool_t reply)\r
+ {\r
+- void *local = talloc_new (ctx);\r
+ InternetAddressList *recipients;\r
+ const char *recipients_string;\r
+ \r
+- printf ("{%s: %s",\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 (local, "From"),\r
+- json_quote_str (local, g_mime_message_get_sender (message)));\r
++ sp->begin_map (sp);\r
++\r
++ sp->map_key (sp, "Subject");\r
++ sp->string (sp, g_mime_message_get_subject (message));\r
++\r
++ sp->map_key (sp, "From");\r
++ sp->string (sp, g_mime_message_get_sender (message));\r
++\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 (local, "To"),\r
+- json_quote_str (local, recipients_string));\r
++ if (recipients_string) {\r
++ sp->map_key (sp, "To");\r
++ sp->string (sp, recipients_string);\r
++ }\r
++\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 (local, "Cc"),\r
+- json_quote_str (local, recipients_string));\r
++ if (recipients_string) {\r
++ sp->map_key (sp, "Cc");\r
++ sp->string (sp, recipients_string);\r
++ }\r
+ \r
+ if (reply) {\r
+- printf (", %s: %s",\r
+- json_quote_str (local, "In-reply-to"),\r
+- json_quote_str (local, g_mime_object_get_header (GMIME_OBJECT (message), "In-reply-to")));\r
++ sp->map_key (sp, "In-reply-to");\r
++ sp->string (sp, g_mime_object_get_header (GMIME_OBJECT (message), "In-reply-to"));\r
+ \r
+- printf (", %s: %s",\r
+- json_quote_str (local, "References"),\r
+- json_quote_str (local, g_mime_object_get_header (GMIME_OBJECT (message), "References")));\r
++ sp->map_key (sp, "References");\r
++ sp->string (sp, g_mime_object_get_header (GMIME_OBJECT (message), "References"));\r
+ } else {\r
+- printf (", %s: %s",\r
+- json_quote_str (local, "Date"),\r
+- json_quote_str (local, g_mime_message_get_date_as_string (message)));\r
++ sp->map_key (sp, "Date");\r
++ sp->string (sp, g_mime_message_get_date_as_string (message));\r
+ }\r
+ \r
+- printf ("}");\r
+-\r
+- talloc_free (local);\r
++ sp->end (sp);\r
+ }\r
+ \r
+ /* Write a MIME text part out to the given stream.\r
+@@ -575,7 +573,7 @@ format_part_json (const void *ctx, sprinter_t *sp, mime_node_t *node,\r
+ format_message_json (ctx, node->envelope_file);\r
+ \r
+ printf ("\"headers\": ");\r
+- format_headers_json (ctx, GMIME_MESSAGE (node->part), FALSE);\r
++ format_headers_json (sp, GMIME_MESSAGE (node->part), FALSE);\r
+ \r
+ if (output_body) {\r
+ printf (", \"body\": [");\r
+@@ -651,7 +649,7 @@ format_part_json (const void *ctx, sprinter_t *sp, mime_node_t *node,\r
+ } else if (GMIME_IS_MESSAGE (node->part)) {\r
+ printf (", \"content\": [{");\r
+ printf ("\"headers\": ");\r
+- format_headers_json (local, GMIME_MESSAGE (node->part), FALSE);\r
++ format_headers_json (sp, GMIME_MESSAGE (node->part), FALSE);\r
+ \r
+ printf (", \"body\": [");\r
+ terminator = "]}]";\r
+-- \r
+1.7.10\r
+\r
projects / notmuch-archives.git / commitdiff