--- /dev/null
+Return-Path: <nex@nexoid.at>\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 035AA431FB6\r
+ for <notmuch@notmuchmail.org>; Thu, 6 Dec 2012 13:12:37 -0800 (PST)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: 0.001\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=0.001 tagged_above=-999 required=5\r
+ tests=[FREEMAIL_FROM=0.001] 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 aMUUOYuYY9DD for <notmuch@notmuchmail.org>;\r
+ Thu, 6 Dec 2012 13:12:33 -0800 (PST)\r
+Received: from mail.nexoid.at (www.nexoid.at [178.79.130.240])\r
+ (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))\r
+ (No client certificate requested)\r
+ by olra.theworths.org (Postfix) with ESMTPS id 8E03A431FC7\r
+ for <notmuch@notmuchmail.org>; Thu, 6 Dec 2012 13:12:30 -0800 (PST)\r
+Received: by mail.nexoid.at (Postfix, from userid 1000)\r
+ id 43CE111C10E; Thu, 6 Dec 2012 22:12:23 +0100 (CET)\r
+From: Peter Feigl <craven@gmx.net>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH v5 2/5] Rename the -json printer functions in notmuch-reply\r
+ and notmuch-show to generic -sprinter functions.\r
+Date: Thu, 6 Dec 2012 22:12:12 +0100\r
+Message-Id: <1354828335-18151-3-git-send-email-craven@gmx.net>\r
+X-Mailer: git-send-email 1.8.0\r
+In-Reply-To: <1354828335-18151-1-git-send-email-craven@gmx.net>\r
+References: <1354828335-18151-1-git-send-email-craven@gmx.net>\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: Thu, 06 Dec 2012 21:12:37 -0000\r
+\r
+All the structured output functions in notmuch-reply and notmuch-show\r
+are renamed to a generic name (as they do not contain any json-specific\r
+code anyway). This patch is a preparation to actually using the new\r
+S-Expression sprinter in notmuch-reply and notmuch-show.\r
+---\r
+ devel/schemata | 16 ++++++++--------\r
+ notmuch-client.h | 8 ++++----\r
+ notmuch-reply.c | 43 ++++++++++++++++++++++++++-----------------\r
+ notmuch-show.c | 40 ++++++++++++++++++++--------------------\r
+ 4 files changed, 58 insertions(+), 49 deletions(-)\r
+\r
+diff --git a/devel/schemata b/devel/schemata\r
+index e44da71..e5c5505 100644\r
+--- a/devel/schemata\r
++++ b/devel/schemata\r
+@@ -36,9 +36,9 @@ thread_node = [\r
+ [thread_node*] # children of message\r
+ ]\r
+ \r
+-# A message (format_part_json)\r
++# A message (format_part_sprinter)\r
+ message = {\r
+- # (format_message_json)\r
++ # (format_message_sprinter)\r
+ id: messageid,\r
+ match: bool,\r
+ filename: string,\r
+@@ -50,7 +50,7 @@ message = {\r
+ body?: [part] # omitted if --body=false\r
+ }\r
+ \r
+-# A MIME part (format_part_json)\r
++# A MIME part (format_part_sprinter)\r
+ part = {\r
+ id: int|string, # part id (currently DFS part number)\r
+ \r
+@@ -72,7 +72,7 @@ part = {\r
+ content?: string\r
+ }\r
+ \r
+-# The headers of a message or part (format_headers_json with reply = FALSE)\r
++# The headers of a message or part (format_headers_sprinter with reply = FALSE)\r
+ headers = {\r
+ Subject: string,\r
+ From: string,\r
+@@ -83,10 +83,10 @@ headers = {\r
+ Date: string\r
+ }\r
+ \r
+-# Encryption status (format_part_json)\r
++# Encryption status (format_part_sprinter)\r
+ encstatus = [{status: "good"|"bad"}]\r
+ \r
+-# Signature status (format_part_sigstatus_json)\r
++# Signature status (format_part_sigstatus_sprinter)\r
+ sigstatus = [signature*]\r
+ \r
+ signature = {\r
+@@ -140,11 +140,11 @@ reply = {\r
+ # The headers of the constructed reply\r
+ reply-headers: reply_headers,\r
+ \r
+- # As in the show format (format_part_json)\r
++ # As in the show format (format_part_sprinter)\r
+ original: message\r
+ }\r
+ \r
+-# Reply headers (format_headers_json with reply = TRUE)\r
++# Reply headers (format_headers_sprinter with reply = TRUE)\r
+ reply_headers = {\r
+ Subject: string,\r
+ From: string,\r
+diff --git a/notmuch-client.h b/notmuch-client.h\r
+index ae9344b..1c336dc 100644\r
+--- a/notmuch-client.h\r
++++ b/notmuch-client.h\r
+@@ -175,12 +175,12 @@ notmuch_status_t\r
+ show_one_part (const char *filename, int part);\r
+ \r
+ void\r
+-format_part_json (const void *ctx, struct sprinter *sp, mime_node_t *node,\r
+- notmuch_bool_t first, notmuch_bool_t output_body);\r
++format_part_sprinter (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 (struct sprinter *sp, GMimeMessage *message,\r
+- notmuch_bool_t reply);\r
++format_headers_sprinter (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 e60a264..ef450b2 100644\r
+--- a/notmuch-reply.c\r
++++ b/notmuch-reply.c\r
+@@ -548,7 +548,8 @@ notmuch_reply_format_default(void *ctx,\r
+ notmuch_config_t *config,\r
+ notmuch_query_t *query,\r
+ notmuch_show_params_t *params,\r
+- notmuch_bool_t reply_all)\r
++ notmuch_bool_t reply_all,\r
++ unused (sprinter_t *sp))\r
+ {\r
+ GMimeMessage *reply;\r
+ notmuch_messages_t *messages;\r
+@@ -587,17 +588,17 @@ notmuch_reply_format_default(void *ctx,\r
+ }\r
+ \r
+ static int\r
+-notmuch_reply_format_json(void *ctx,\r
+- notmuch_config_t *config,\r
+- notmuch_query_t *query,\r
+- notmuch_show_params_t *params,\r
+- notmuch_bool_t reply_all)\r
++notmuch_reply_format_sprinter(void *ctx,\r
++ notmuch_config_t *config,\r
++ notmuch_query_t *query,\r
++ notmuch_show_params_t *params,\r
++ notmuch_bool_t reply_all,\r
++ sprinter_t *sp)\r
+ {\r
+ GMimeMessage *reply;\r
+ notmuch_messages_t *messages;\r
+ notmuch_message_t *message;\r
+ mime_node_t *node;\r
+- sprinter_t *sp;\r
+ \r
+ if (notmuch_query_count_messages (query) != 1) {\r
+ fprintf (stderr, "Error: search term did not match precisely one message.\n");\r
+@@ -613,18 +614,17 @@ notmuch_reply_format_json(void *ctx,\r
+ if (!reply)\r
+ return 1;\r
+ \r
+- sp = sprinter_json_create (ctx, stdout);\r
+ sp->begin_map (sp);\r
+ \r
+ /* The headers of the reply message we've created */\r
+ sp->map_key (sp, "reply-headers");\r
+- format_headers_json (sp, reply, TRUE);\r
++ format_headers_sprinter (sp, reply, TRUE);\r
+ g_object_unref (G_OBJECT (reply));\r
+ reply = NULL;\r
+ \r
+ /* Start the original */\r
+ sp->map_key (sp, "original");\r
+- format_part_json (ctx, sp, node, TRUE, TRUE);\r
++ format_part_sprinter (ctx, sp, node, TRUE, TRUE);\r
+ \r
+ /* End */\r
+ sp->end (sp);\r
+@@ -639,7 +639,8 @@ notmuch_reply_format_headers_only(void *ctx,\r
+ notmuch_config_t *config,\r
+ notmuch_query_t *query,\r
+ unused (notmuch_show_params_t *params),\r
+- notmuch_bool_t reply_all)\r
++ notmuch_bool_t reply_all,\r
++ unused (sprinter_t *sp))\r
+ {\r
+ GMimeMessage *reply;\r
+ notmuch_messages_t *messages;\r
+@@ -707,7 +708,12 @@ notmuch_reply_command (void *ctx, int argc, char *argv[])\r
+ notmuch_query_t *query;\r
+ char *query_string;\r
+ int opt_index, ret = 0;\r
+- int (*reply_format_func)(void *ctx, notmuch_config_t *config, notmuch_query_t *query, notmuch_show_params_t *params, notmuch_bool_t reply_all);\r
++ int (*reply_format_func) (void *ctx,\r
++ notmuch_config_t *config,\r
++ notmuch_query_t *query,\r
++ notmuch_show_params_t *params,\r
++ notmuch_bool_t reply_all,\r
++ struct sprinter *sp);\r
+ notmuch_show_params_t params = {\r
+ .part = -1,\r
+ .crypto = {\r
+@@ -717,6 +723,7 @@ notmuch_reply_command (void *ctx, int argc, char *argv[])\r
+ };\r
+ int format = FORMAT_DEFAULT;\r
+ int reply_all = TRUE;\r
++ struct sprinter *sp = NULL;\r
+ \r
+ notmuch_opt_desc_t options[] = {\r
+ { NOTMUCH_OPT_KEYWORD, &format, "format", 'f',\r
+@@ -738,12 +745,14 @@ notmuch_reply_command (void *ctx, int argc, char *argv[])\r
+ return 1;\r
+ }\r
+ \r
+- if (format == FORMAT_HEADERS_ONLY)\r
++ if (format == FORMAT_HEADERS_ONLY) {\r
+ reply_format_func = notmuch_reply_format_headers_only;\r
+- else if (format == FORMAT_JSON)\r
+- reply_format_func = notmuch_reply_format_json;\r
+- else\r
++ } else if (format == FORMAT_JSON) {\r
++ reply_format_func = notmuch_reply_format_sprinter;\r
++ sp = sprinter_json_create (ctx, stdout);\r
++ } else {\r
+ reply_format_func = notmuch_reply_format_default;\r
++ }\r
+ \r
+ config = notmuch_config_open (ctx, NULL, NULL);\r
+ if (config == NULL)\r
+@@ -770,7 +779,7 @@ notmuch_reply_command (void *ctx, int argc, char *argv[])\r
+ return 1;\r
+ }\r
+ \r
+- if (reply_format_func (ctx, config, query, ¶ms, reply_all) != 0)\r
++ if (reply_format_func (ctx, config, query, ¶ms, reply_all, sp) != 0)\r
+ return 1;\r
+ \r
+ notmuch_crypto_cleanup (¶ms.crypto);\r
+diff --git a/notmuch-show.c b/notmuch-show.c\r
+index 2fa2292..d3f08bc 100644\r
+--- a/notmuch-show.c\r
++++ b/notmuch-show.c\r
+@@ -32,12 +32,12 @@ static const notmuch_show_format_t format_text = {\r
+ };\r
+ \r
+ static notmuch_status_t\r
+-format_part_json_entry (const void *ctx, sprinter_t *sp, mime_node_t *node,\r
+- int indent, const notmuch_show_params_t *params);\r
++format_part_sprinter_entry (const void *ctx, sprinter_t *sp, mime_node_t *node,\r
++ int indent, const notmuch_show_params_t *params);\r
+ \r
+ static const notmuch_show_format_t format_json = {\r
+ .new_sprinter = sprinter_json_create,\r
+- .part = format_part_json_entry,\r
++ .part = format_part_sprinter_entry,\r
+ };\r
+ \r
+ static notmuch_status_t\r
+@@ -108,7 +108,7 @@ _get_one_line_summary (const void *ctx, notmuch_message_t *message)\r
+ /* Emit a sequence of key/value pairs for the metadata of message.\r
+ * The caller should begin a map before calling this. */\r
+ static void\r
+-format_message_json (sprinter_t *sp, notmuch_message_t *message)\r
++format_message_sprinter (sprinter_t *sp, notmuch_message_t *message)\r
+ {\r
+ /* Any changes to the JSON format should be reflected in the file\r
+ * devel/schemata. */\r
+@@ -208,8 +208,8 @@ _is_from_line (const char *line)\r
+ }\r
+ \r
+ void\r
+-format_headers_json (sprinter_t *sp, GMimeMessage *message,\r
+- notmuch_bool_t reply)\r
++format_headers_sprinter (sprinter_t *sp, GMimeMessage *message,\r
++ notmuch_bool_t reply)\r
+ {\r
+ /* Any changes to the JSON format should be reflected in the file\r
+ * devel/schemata. */\r
+@@ -363,7 +363,7 @@ signer_status_to_string (GMimeSignerStatus x)\r
+ \r
+ #ifdef GMIME_ATLEAST_26\r
+ static void\r
+-format_part_sigstatus_json (sprinter_t *sp, mime_node_t *node)\r
++format_part_sigstatus_sprinter (sprinter_t *sp, mime_node_t *node)\r
+ {\r
+ /* Any changes to the JSON format should be reflected in the file\r
+ * devel/schemata. */\r
+@@ -438,7 +438,7 @@ format_part_sigstatus_json (sprinter_t *sp, mime_node_t *node)\r
+ }\r
+ #else\r
+ static void\r
+-format_part_sigstatus_json (sprinter_t *sp, mime_node_t *node)\r
++format_part_sigstatus_sprinter (sprinter_t *sp, mime_node_t *node)\r
+ {\r
+ const GMimeSignatureValidity* validity = node->sig_validity;\r
+ \r
+@@ -595,23 +595,23 @@ format_part_text (const void *ctx, sprinter_t *sp, mime_node_t *node,\r
+ }\r
+ \r
+ void\r
+-format_part_json (const void *ctx, sprinter_t *sp, mime_node_t *node,\r
+- notmuch_bool_t first, notmuch_bool_t output_body)\r
++format_part_sprinter (const void *ctx, sprinter_t *sp, mime_node_t *node,\r
++ notmuch_bool_t first, notmuch_bool_t output_body)\r
+ {\r
+ /* Any changes to the JSON format should be reflected in the file\r
+ * devel/schemata. */\r
+ \r
+ if (node->envelope_file) {\r
+ sp->begin_map (sp);\r
+- format_message_json (sp, node->envelope_file);\r
++ format_message_sprinter (sp, node->envelope_file);\r
+ \r
+ sp->map_key (sp, "headers");\r
+- format_headers_json (sp, GMIME_MESSAGE (node->part), FALSE);\r
++ format_headers_sprinter (sp, GMIME_MESSAGE (node->part), FALSE);\r
+ \r
+ if (output_body) {\r
+ sp->map_key (sp, "body");\r
+ sp->begin_list (sp);\r
+- format_part_json (ctx, sp, mime_node_child (node, 0), first, TRUE);\r
++ format_part_sprinter (ctx, sp, mime_node_child (node, 0), first, TRUE);\r
+ sp->end (sp);\r
+ }\r
+ sp->end (sp);\r
+@@ -646,7 +646,7 @@ format_part_json (const void *ctx, sprinter_t *sp, mime_node_t *node,\r
+ \r
+ if (node->verify_attempted) {\r
+ sp->map_key (sp, "sigstatus");\r
+- format_part_sigstatus_json (sp, node);\r
++ format_part_sigstatus_sprinter (sp, node);\r
+ }\r
+ \r
+ sp->map_key (sp, "content-type");\r
+@@ -698,7 +698,7 @@ format_part_json (const void *ctx, sprinter_t *sp, mime_node_t *node,\r
+ sp->begin_map (sp);\r
+ \r
+ sp->map_key (sp, "headers");\r
+- format_headers_json (sp, GMIME_MESSAGE (node->part), FALSE);\r
++ format_headers_sprinter (sp, GMIME_MESSAGE (node->part), FALSE);\r
+ \r
+ sp->map_key (sp, "body");\r
+ sp->begin_list (sp);\r
+@@ -706,7 +706,7 @@ format_part_json (const void *ctx, sprinter_t *sp, mime_node_t *node,\r
+ }\r
+ \r
+ for (i = 0; i < node->nchildren; i++)\r
+- format_part_json (ctx, sp, mime_node_child (node, i), i == 0, TRUE);\r
++ format_part_sprinter (ctx, sp, mime_node_child (node, i), i == 0, TRUE);\r
+ \r
+ /* Close content structures */\r
+ for (i = 0; i < nclose; i++)\r
+@@ -716,11 +716,11 @@ format_part_json (const void *ctx, sprinter_t *sp, mime_node_t *node,\r
+ }\r
+ \r
+ static notmuch_status_t\r
+-format_part_json_entry (const void *ctx, sprinter_t *sp,\r
+- mime_node_t *node, unused (int indent),\r
+- const notmuch_show_params_t *params)\r
++format_part_sprinter_entry (const void *ctx, sprinter_t *sp,\r
++ mime_node_t *node, unused (int indent),\r
++ const notmuch_show_params_t *params)\r
+ {\r
+- format_part_json (ctx, sp, node, TRUE, params->output_body);\r
++ format_part_sprinter (ctx, sp, node, TRUE, params->output_body);\r
+ \r
+ return NOTMUCH_STATUS_SUCCESS;\r
+ }\r
+-- \r
+1.8.0\r
+\r
projects / notmuch-archives.git / commitdiff