From: Austin Clements <amdragon@MIT.EDU>
To: notmuch@notmuchmail.org
Cc: tomi.ollila@iki.fi
Subject: [PATCH v2 5/8] show: Simplify talloc use in format_headers_json
Date: Sun, 19 Feb 2012 19:26:27 -0500 [thread overview]
Message-ID: <1329697590-7404-6-git-send-email-amdragon@mit.edu> (raw)
In-Reply-To: <1329697590-7404-1-git-send-email-amdragon@mit.edu>
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
next prev parent reply other threads:[~2012-02-20 0:26 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-02-14 17:33 [PATCH 0/8] Rewrite JSON show format Austin Clements
2012-02-14 17:33 ` [PATCH 1/8] Document the JSON schemata used by show and search Austin Clements
2012-02-14 17:33 ` [PATCH 2/8] show: Convert JSON format to the new self-recursive style Austin Clements
2012-02-14 17:33 ` [PATCH 3/8] show: Use consistent header ordering in the JSON format Austin Clements
2012-02-14 17:33 ` [PATCH 4/8] show: Unify JSON header output for messages and message parts Austin Clements
2012-02-14 17:33 ` [PATCH 5/8] show: Simplify talloc use in format_headers_json Austin Clements
2012-02-14 17:33 ` [PATCH 6/8] show: Make JSON helper functions print complete objects Austin Clements
2012-02-14 17:33 ` [PATCH 7/8] show: Make format_part_sigstatus_json's API consistent between GMIME 2.4 and 2.6 Austin Clements
2012-02-14 17:33 ` [PATCH 8/8] show: Further general simplifications of the JSON formatter Austin Clements
2012-02-15 5:45 ` [PATCH 0/8] Rewrite JSON show format Adam Wolfe Gordon
2012-02-15 15:00 ` Tomi Ollila
2012-02-15 15:20 ` Adam Wolfe Gordon
2012-02-15 18:15 ` Austin Clements
2012-02-20 0:26 ` [PATCH v2 " Austin Clements
2012-02-20 0:26 ` [PATCH v2 1/8] Document the JSON schemata used by show and search Austin Clements
2012-02-28 2:47 ` David Bremner
2012-02-20 0:26 ` [PATCH v2 2/8] show: Convert JSON format to the new self-recursive style Austin Clements
2012-03-01 12:35 ` David Bremner
2012-02-20 0:26 ` [PATCH v2 3/8] show: Use consistent header ordering in the JSON format Austin Clements
2012-02-20 0:26 ` [PATCH v2 4/8] show: Unify JSON header output for messages and message parts Austin Clements
2012-02-20 0:26 ` Austin Clements [this message]
2012-02-20 0:26 ` [PATCH v2 6/8] show: Make JSON helper functions print complete objects Austin Clements
2012-02-20 0:26 ` [PATCH v2 7/8] show: Make format_part_sigstatus_json's API consistent between GMIME 2.4 and 2.6 Austin Clements
2012-02-20 0:26 ` [PATCH v2 8/8] show: Further general simplifications of the JSON formatter Austin Clements
2012-02-20 10:17 ` [PATCH v2 0/8] Rewrite JSON show format Tomi Ollila
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://notmuchmail.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1329697590-7404-6-git-send-email-amdragon@mit.edu \
--to=amdragon@mit.edu \
--cc=notmuch@notmuchmail.org \
--cc=tomi.ollila@iki.fi \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://yhetil.org/notmuch.git/
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).