debian/notmuch
1
0
Fork 0
mirror of https://git.notmuchmail.org/git/notmuch synced 2024-11-22 10:58:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

show: Simplify talloc use in format_headers_json

Browse source 
Previously there was an unnecessary talloc context.
This commit is contained in:
Austin Clements 2012-02-19 19:26:27 -05:00 committed by David Bremner
parent 86f89385c3
commit 63ee244c8e
1 changed files with 15 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
notmuch-show.c
View file

@ -291,37 +291,35 @@ format_headers_message_part_text (GMimeMessage *message)
} }
static void static void
format_headers_json (GMimeMessage *message) format_headers_json (const void *ctx, GMimeMessage *message)
{ {
void *ctx = talloc_new (NULL); void *local = talloc_new (ctx);
void *ctx_quote = talloc_new (ctx);
InternetAddressList *recipients; InternetAddressList *recipients;
const char *recipients_string; const char *recipients_string;
printf ("%s: %s", printf ("%s: %s",
json_quote_str (ctx_quote, "Subject"), json_quote_str (local, "Subject"),
json_quote_str (ctx_quote, g_mime_message_get_subject (message))); json_quote_str (local, g_mime_message_get_subject (message)));
printf (", %s: %s", printf (", %s: %s",
json_quote_str (ctx_quote, "From"), json_quote_str (local, "From"),
json_quote_str (ctx_quote, g_mime_message_get_sender (message))); json_quote_str (local, g_mime_message_get_sender (message)));
recipients = g_mime_message_get_recipients (message, GMIME_RECIPIENT_TYPE_TO); recipients = g_mime_message_get_recipients (message, GMIME_RECIPIENT_TYPE_TO);
recipients_string = internet_address_list_to_string (recipients, 0); recipients_string = internet_address_list_to_string (recipients, 0);
if (recipients_string) if (recipients_string)
printf (", %s: %s", printf (", %s: %s",
json_quote_str (ctx_quote, "To"), json_quote_str (local, "To"),
json_quote_str (ctx_quote, recipients_string)); json_quote_str (local, recipients_string));
recipients = g_mime_message_get_recipients (message, GMIME_RECIPIENT_TYPE_CC); recipients = g_mime_message_get_recipients (message, GMIME_RECIPIENT_TYPE_CC);
recipients_string = internet_address_list_to_string (recipients, 0); recipients_string = internet_address_list_to_string (recipients, 0);
if (recipients_string) if (recipients_string)
printf (", %s: %s", printf (", %s: %s",
json_quote_str (ctx_quote, "Cc"), json_quote_str (local, "Cc"),
json_quote_str (ctx_quote, recipients_string)); json_quote_str (local, recipients_string));
printf (", %s: %s", printf (", %s: %s",
json_quote_str (ctx_quote, "Date"), json_quote_str (local, "Date"),
json_quote_str (ctx_quote, g_mime_message_get_date_as_string (message))); json_quote_str (local, g_mime_message_get_date_as_string (message)));
talloc_free (ctx_quote); talloc_free (local);
talloc_free (ctx);
} }
/* Write a MIME text part out to the given stream. /* 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); format_message_json (ctx, node->envelope_file);
printf ("\"headers\": {"); printf ("\"headers\": {");
format_headers_json (GMIME_MESSAGE (node->part)); format_headers_json (ctx, GMIME_MESSAGE (node->part));
printf ("}"); printf ("}");
printf (", \"body\": ["); 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)) { if (GMIME_IS_MESSAGE (node->part)) {
printf ("\"headers\": {"); printf ("\"headers\": {");
format_headers_json (GMIME_MESSAGE (node->part)); format_headers_json (local, GMIME_MESSAGE (node->part));
printf ("}"); printf ("}");
printf (", \"body\": ["); printf (", \"body\": [");