From: Austin Clements Date: Wed, 25 Jul 2012 02:34:47 +0000 (+2000) Subject: [PATCH 07/13] show: Convert format_headers_json to use sprinter X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=2e36026b2f9ec7f338d5618c1117312d54d8078c;p=notmuch-archives.git [PATCH 07/13] show: Convert format_headers_json to use sprinter --- diff --git a/26/8f3b130f1bc656fa4928ab204bb162fdd29d9c b/26/8f3b130f1bc656fa4928ab204bb162fdd29d9c new file mode 100644 index 000000000..1d24f4cb9 --- /dev/null +++ b/26/8f3b130f1bc656fa4928ab204bb162fdd29d9c @@ -0,0 +1,208 @@ +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 8C219429E30 + for ; Tue, 24 Jul 2012 19:35:08 -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 sQM+Oljdy8qq for ; + Tue, 24 Jul 2012 19:35:07 -0700 (PDT) +Received: from dmz-mailsec-scanner-4.mit.edu (DMZ-MAILSEC-SCANNER-4.MIT.EDU + [18.9.25.15]) + by olra.theworths.org (Postfix) with ESMTP id E40DC431FBD + for ; Tue, 24 Jul 2012 19:35:05 -0700 (PDT) +X-AuditID: 1209190f-b7f306d0000008b4-cf-500f5b5953d9 +Received: from mailhub-auth-3.mit.edu ( [18.9.21.43]) + by dmz-mailsec-scanner-4.mit.edu (Symantec Messaging Gateway) with SMTP + id 79.2E.02228.95B5F005; Tue, 24 Jul 2012 22:35:05 -0400 (EDT) +Received: from outgoing.mit.edu (OUTGOING-AUTH.MIT.EDU [18.7.22.103]) + by mailhub-auth-3.mit.edu (8.13.8/8.9.2) with ESMTP id q6P2Z5EL002600; + Tue, 24 Jul 2012 22:35:05 -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 q6P2Z2kY025126 + (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT); + Tue, 24 Jul 2012 22:35:04 -0400 (EDT) +Received: from amthrax by drake.dyndns.org with local (Exim 4.77) + (envelope-from ) + id 1StrRG-0004Zw-IO; Tue, 24 Jul 2012 22:35:02 -0400 +From: Austin Clements +To: notmuch@notmuchmail.org +Subject: [PATCH 07/13] show: Convert format_headers_json to use sprinter +Date: Tue, 24 Jul 2012 22:34:47 -0400 +Message-Id: <1343183693-17134-8-git-send-email-amdragon@mit.edu> +X-Mailer: git-send-email 1.7.10 +In-Reply-To: <1343183693-17134-1-git-send-email-amdragon@mit.edu> +References: <1343183693-17134-1-git-send-email-amdragon@mit.edu> +X-Brightmail-Tracker: + H4sIAAAAAAAAA+NgFtrNIsWRmVeSWpSXmKPExsUixCmqrRsZzR9gMPeHqsXehnZGi+s3ZzI7 + MHks3rSfzePZqlvMAUxRXDYpqTmZZalF+nYJXBltL/+xFjxWrXg61bKB8alcFyMnh4SAiURT + 8x0mCFtM4sK99WxdjFwcQgL7GCWubTjPDuFsYJT4+/cRC4TziEmi8/1bRghnLqPE1qkzWUD6 + 2QQ0JLbtX84IYosISEvsvDubFcRmFjCTmPtzItBcDg5hAQ+Jjc8YQUwWAVWJ321sIBW8Ag4S + x++tZoa4Ql7i6f0+sDingKPE+SULwSYKAdX0LL7GPoGRfwEjwypG2ZTcKt3cxMyc4tRk3eLk + xLy81CJdE73czBK91JTSTYzgMJLk38H47aDSIUYBDkYlHt4/T/gChFgTy4orcw8xSnIwKYny + VgTzBwjxJeWnVGYkFmfEF5XmpBYfYpTgYFYS4S0KA8rxpiRWVqUW5cOkpDlYlMR5r6bc9BcS + SE8sSc1OTS1ILYLJynBwKEnwtkYBNQoWpaanVqRl5pQgpJk4OEGG8wAN3w1Sw1tckJhbnJkO + kT/FqCglzjsXJCEAksgozYPrhcX5K0ZxoFeEeZtBqniAKQKu+xXQYCagwc/D+EAGlyQipKQa + GAXatr23Fd0hvPP870qenKNfLhUF7eO+cdfc5fCZF2mq5UX6l2U3Fd3o8hIKCp9f/6RyMX+V + X2fes9NBO5yT/bZIiNjcPG5xy3LK9TOrHTa1pryf90n5dF8zM/v7SelKbevl7FY9a/Ho+iN/ + MKVx/VFjSdvjrR/Y3vkZKfZdiYh6a1i37u+dRUosxRmJhlrMRcWJANcHcpXOAgAA +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: Wed, 25 Jul 2012 02:35:08 -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 +