From 393c7134f8cedee6dcd657ca6270935b610708ce Mon Sep 17 00:00:00 2001 From: Austin Clements Date: Sun, 29 Jul 2012 00:29:08 +2000 Subject: [PATCH] [PATCH v2 07/13] show: Convert format_headers_json to use sprinter --- e7/a073420665e26113c693491969d36e2a7e4588 | 210 ++++++++++++++++++++++ 1 file changed, 210 insertions(+) create mode 100644 e7/a073420665e26113c693491969d36e2a7e4588 diff --git a/e7/a073420665e26113c693491969d36e2a7e4588 b/e7/a073420665e26113c693491969d36e2a7e4588 new file mode 100644 index 000000000..a68f5bc08 --- /dev/null +++ b/e7/a073420665e26113c693491969d36e2a7e4588 @@ -0,0 +1,210 @@ +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 8D3BB431FC7 + for ; Fri, 27 Jul 2012 21:29:26 -0700 (PDT) +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 aVk3MXLYm5LF for ; + Fri, 27 Jul 2012 21:29:25 -0700 (PDT) +Received: from dmz-mailsec-scanner-2.mit.edu (DMZ-MAILSEC-SCANNER-2.MIT.EDU + [18.9.25.13]) + by olra.theworths.org (Postfix) with ESMTP id 28697431FAE + for ; Fri, 27 Jul 2012 21:29:25 -0700 (PDT) +X-AuditID: 1209190d-b7fd56d000000933-8a-50136aa46894 +Received: from mailhub-auth-1.mit.edu ( [18.9.21.35]) + by dmz-mailsec-scanner-2.mit.edu (Symantec Messaging Gateway) with SMTP + id 66.04.02355.4AA63105; Sat, 28 Jul 2012 00:29:24 -0400 (EDT) +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 q6S4TNxp017241; + Sat, 28 Jul 2012 00:29:23 -0400 +Received: from drake.dyndns.org + (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 q6S4TKZa027358 + (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT); + Sat, 28 Jul 2012 00:29:22 -0400 (EDT) +Received: from amthrax by drake.dyndns.org with local (Exim 4.77) + (envelope-from ) + id 1SuyeW-0002X0-MB; Sat, 28 Jul 2012 00:29:20 -0400 +From: Austin Clements +To: notmuch@notmuchmail.org +Subject: [PATCH v2 07/13] show: Convert format_headers_json to use sprinter +Date: Sat, 28 Jul 2012 00:29:08 -0400 +Message-Id: <1343449754-9010-8-git-send-email-amdragon@mit.edu> +X-Mailer: git-send-email 1.7.10 +In-Reply-To: <1343449754-9010-1-git-send-email-amdragon@mit.edu> +References: <1343449754-9010-1-git-send-email-amdragon@mit.edu> +X-Brightmail-Tracker: + H4sIAAAAAAAAA+NgFjrLIsWRmVeSWpSXmKPExsUixCmqrLskSzjAYPlHDYu9De2MFqvn8lhc + vzmT2eLNynmsDiweO2fdZfdYvGk/m8fhrwtZPJ6tusUcwBLFZZOSmpNZllqkb5fAldH28h9r + wWPViqdTLRsYn8p1MXJySAiYSBw88JgNwhaTuHBvPZDNxSEksI9R4snE2ewQzgZGib9f3zCD + VAkJPGKSeH2ADcKeyyix/YU7iM0moCGxbf9yRhBbREBaYufd2axdjBwczAJ5Eo/XSoCEhQW8 + JWY8fAJWwiKgKnFs6xpWEJtXwF7i0+oHrBBHyEs8vd8HNp5TwEFi88sPUGvtJXZP3sA6gZF/ + ASPDKkbZlNwq3dzEzJzi1GTd4uTEvLzUIl0jvdzMEr3UlNJNjOBQk+TdwfjuoNIhRgEORiUe + 3lNXhAKEWBPLiitzDzFKcjApifJGhQsHCPEl5adUZiQWZ8QXleakFh9ilOBgVhLh3SkIlONN + SaysSi3Kh0lJc7AoifNeSbnpLySQnliSmp2aWpBaBJOV4eBQkuDdngnUKFiUmp5akZaZU4KQ + ZuLgBBnOAzR8DUgNb3FBYm5xZjpE/hSjopQ472OQhABIIqM0D64XlgpeMYoDvSLMKwxMDEI8 + wDQC1/0KaDAT0GCLaCGQwSWJCCmpBsZj7unbpkh9ZWf8sy1o2px5DWl3WGrvRX75N2/dtuDo + eMOMq+y7jU6+LMw7vFxhziqj97rqgWXzHW9W6WZmN8xlOpp3WeBsq9DbRyy7Jz1UNnaq1XrH + atPO1u5hcDaR1dIss+LaUb5ezpgPvec/HE+2euPtXBZzakqQ9i+LRed3xNXet/7ApKjEUpyR + aKjFXFScCACVWsZy4AIAAA== +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: Sat, 28 Jul 2012 04:29:26 -0000 + +This no longer requires a talloc context (not that it really did +before since it didn't return anything), so we remove its context +argument. +--- + notmuch-client.h | 3 ++- + notmuch-reply.c | 2 +- + notmuch-show.c | 58 ++++++++++++++++++++++++++---------------------------- + 3 files changed, 31 insertions(+), 32 deletions(-) + +diff --git a/notmuch-client.h b/notmuch-client.h +index 8eeedf7..21c3231 100644 +--- a/notmuch-client.h ++++ b/notmuch-client.h +@@ -183,7 +183,8 @@ format_part_json (const void *ctx, sprinter_t *sp, mime_node_t *node, + notmuch_bool_t first, notmuch_bool_t output_body); + + void +-format_headers_json (const void *ctx, GMimeMessage *message, notmuch_bool_t reply); ++format_headers_json (sprinter_t *sp, GMimeMessage *message, ++ notmuch_bool_t reply); + + typedef enum { + NOTMUCH_SHOW_TEXT_PART_REPLY = 1 << 0, +diff --git a/notmuch-reply.c b/notmuch-reply.c +index 07d4452..fa6665f 100644 +--- a/notmuch-reply.c ++++ b/notmuch-reply.c +@@ -617,7 +617,7 @@ notmuch_reply_format_json(void *ctx, + + /* The headers of the reply message we've created */ + printf ("{\"reply-headers\": "); +- format_headers_json (ctx, reply, TRUE); ++ format_headers_json (sp, reply, TRUE); + g_object_unref (G_OBJECT (reply)); + reply = NULL; + +diff --git a/notmuch-show.c b/notmuch-show.c +index b258f65..9852119 100644 +--- a/notmuch-show.c ++++ b/notmuch-show.c +@@ -199,48 +199,46 @@ _is_from_line (const char *line) + } + + void +-format_headers_json (const void *ctx, GMimeMessage *message, notmuch_bool_t reply) ++format_headers_json (sprinter_t *sp, GMimeMessage *message, ++ notmuch_bool_t reply) + { +- void *local = talloc_new (ctx); + InternetAddressList *recipients; + const char *recipients_string; + +- printf ("{%s: %s", +- json_quote_str (local, "Subject"), +- json_quote_str (local, g_mime_message_get_subject (message))); +- printf (", %s: %s", +- json_quote_str (local, "From"), +- json_quote_str (local, g_mime_message_get_sender (message))); ++ sp->begin_map (sp); ++ ++ sp->map_key (sp, "Subject"); ++ sp->string (sp, g_mime_message_get_subject (message)); ++ ++ sp->map_key (sp, "From"); ++ sp->string (sp, 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 (local, "To"), +- json_quote_str (local, recipients_string)); ++ if (recipients_string) { ++ sp->map_key (sp, "To"); ++ sp->string (sp, 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 (local, "Cc"), +- json_quote_str (local, recipients_string)); ++ if (recipients_string) { ++ sp->map_key (sp, "Cc"); ++ sp->string (sp, recipients_string); ++ } + + if (reply) { +- printf (", %s: %s", +- json_quote_str (local, "In-reply-to"), +- json_quote_str (local, g_mime_object_get_header (GMIME_OBJECT (message), "In-reply-to"))); ++ sp->map_key (sp, "In-reply-to"); ++ sp->string (sp, g_mime_object_get_header (GMIME_OBJECT (message), "In-reply-to")); + +- printf (", %s: %s", +- json_quote_str (local, "References"), +- json_quote_str (local, g_mime_object_get_header (GMIME_OBJECT (message), "References"))); ++ sp->map_key (sp, "References"); ++ sp->string (sp, g_mime_object_get_header (GMIME_OBJECT (message), "References")); + } else { +- printf (", %s: %s", +- json_quote_str (local, "Date"), +- json_quote_str (local, g_mime_message_get_date_as_string (message))); ++ sp->map_key (sp, "Date"); ++ sp->string (sp, g_mime_message_get_date_as_string (message)); + } + +- printf ("}"); +- +- talloc_free (local); ++ sp->end (sp); + } + + /* Write a MIME text part out to the given stream. +@@ -575,7 +573,7 @@ format_part_json (const void *ctx, sprinter_t *sp, mime_node_t *node, + format_message_json (ctx, node->envelope_file); + + printf ("\"headers\": "); +- format_headers_json (ctx, GMIME_MESSAGE (node->part), FALSE); ++ format_headers_json (sp, GMIME_MESSAGE (node->part), FALSE); + + if (output_body) { + printf (", \"body\": ["); +@@ -651,7 +649,7 @@ format_part_json (const void *ctx, sprinter_t *sp, mime_node_t *node, + } else if (GMIME_IS_MESSAGE (node->part)) { + printf (", \"content\": [{"); + printf ("\"headers\": "); +- format_headers_json (local, GMIME_MESSAGE (node->part), FALSE); ++ format_headers_json (sp, GMIME_MESSAGE (node->part), FALSE); + + printf (", \"body\": ["); + terminator = "]}]"; +-- +1.7.10 + -- 2.26.2