--- /dev/null
+Return-Path: <amdragon@mit.edu>\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 15C30431FB6\r
+ for <notmuch@notmuchmail.org>; Thu, 6 Dec 2012 07:48:10 -0800 (PST)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -0.7\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5\r
+ tests=[RCVD_IN_DNSWL_LOW=-0.7] 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 r5nsHExkmKZr for <notmuch@notmuchmail.org>;\r
+ Thu, 6 Dec 2012 07:48:09 -0800 (PST)\r
+Received: from dmz-mailsec-scanner-7.mit.edu (DMZ-MAILSEC-SCANNER-7.MIT.EDU\r
+ [18.7.68.36])\r
+ by olra.theworths.org (Postfix) with ESMTP id D5136431FAE\r
+ for <notmuch@notmuchmail.org>; Thu, 6 Dec 2012 07:48:08 -0800 (PST)\r
+X-AuditID: 12074424-b7fe06d0000008f0-56-50c0be38647c\r
+Received: from mailhub-auth-1.mit.edu ( [18.9.21.35])\r
+ by dmz-mailsec-scanner-7.mit.edu (Symantec Messaging Gateway) with SMTP\r
+ id 6C.21.02288.83EB0C05; Thu, 6 Dec 2012 10:48:08 -0500 (EST)\r
+Received: from outgoing.mit.edu (OUTGOING-AUTH.MIT.EDU [18.7.22.103])\r
+ by mailhub-auth-1.mit.edu (8.13.8/8.9.2) with ESMTP id qB6Fm74C023384; \r
+ Thu, 6 Dec 2012 10:48:08 -0500\r
+Received: from awakening.csail.mit.edu (awakening.csail.mit.edu [18.26.4.91])\r
+ (authenticated bits=0)\r
+ (User authenticated as amdragon@ATHENA.MIT.EDU)\r
+ by outgoing.mit.edu (8.13.6/8.12.4) with ESMTP id qB6Fm5C8024625\r
+ (version=TLSv1/SSLv3 cipher=DHE-RSA-AES128-SHA bits=128 verify=NOT);\r
+ Thu, 6 Dec 2012 10:48:06 -0500 (EST)\r
+Received: from amthrax by awakening.csail.mit.edu with local (Exim 4.80)\r
+ (envelope-from <amdragon@mit.edu>)\r
+ id 1TgdgD-00061c-8R; Thu, 06 Dec 2012 10:48:05 -0500\r
+From: Austin Clements <aclements@csail.mit.edu>\r
+To: Peter Feigl <craven@gmx.net>, notmuch@notmuchmail.org\r
+Subject: Re: [PATCH v4 2/5] Rename the -json printer functions in\r
+ notmuch-reply and notmuch-show to generic -sprinter functions.\r
+In-Reply-To:\r
+ <785c9f89c35c861fbbe3ead3fe7289b65d31e216.1354794428.git.craven@gmx.net>\r
+References: <cover.1354794428.git.craven@gmx.net>\r
+ <785c9f89c35c861fbbe3ead3fe7289b65d31e216.1354794428.git.craven@gmx.net>\r
+User-Agent: Notmuch/0.14+159~g6895fee (http://notmuchmail.org) Emacs/23.4.1\r
+ (i486-pc-linux-gnu)\r
+Date: Thu, 06 Dec 2012 10:48:05 -0500\r
+Message-ID: <87ehj3p4ga.fsf@awakening.csail.mit.edu>\r
+MIME-Version: 1.0\r
+Content-Type: text/plain; charset=us-ascii\r
+X-Brightmail-Tracker:\r
+ H4sIAAAAAAAAA+NgFnrAIsWRmVeSWpSXmKPExsUixCmqrGux70CAwbUtfBZ7G9oZLa7fnMns\r
+ wOSxeNN+No9nq24xBzBFcdmkpOZklqUW6dslcGXc+/eSteBvaMWk26eZGhinOXcxcnJICJhI\r
+ /Fkygw3CFpO4cG89kM3FISSwj1Hi85krjCAJIYH1jBJTHnJAJC4wScx90csE4SxhlHi+4Coz\r
+ SBWbgL7EirWTWEFsEQFLialfLoGNEhZoYJSYd/8BWIJTIFRi+b7prBBjqyRmrHwDtIKDQ1Qg\r
+ XmL2OR+QMIuAqsTWBx/YQMK8QOd9O5UHEuYVEJQ4OfMJC4jNLKAlcePfS6YJjAKzkKRmIUkt\r
+ YGRaxSibklulm5uYmVOcmqxbnJyYl5dapGuul5tZopeaUrqJERSQ7C4qOxibDykdYhTgYFTi\r
+ 4X1QsT9AiDWxrLgy9xCjJAeTkiivzJ4DAUJ8SfkplRmJxRnxRaU5qcWHGCU4mJVEeGM6gHK8\r
+ KYmVValF+TApaQ4WJXHe6yk3/YUE0hNLUrNTUwtSi2CyMhwcShK84nuBGgWLUtNTK9Iyc0oQ\r
+ 0kwcnCDDeYCGM4LU8BYXJOYWZ6ZD5E8xKkqJ8+4BuUgAJJFRmgfXC0sYrxjFgV4R5r0AUsUD\r
+ TDZw3a+ABjMBDY5i3w8yuCQRISXVwNi+buPnv5v/cD4T0TvBXjq/Kp/Df4m33No179YnfMlh\r
+ /N+92Oj5vwulD++WySziPWiaLrejIOarV822ZOYjhm+D5q/aJZmu3PPucswqtxqh2Xn39z7q\r
+ VAmKfbLyYUrdwh+GOt9ytd4k7mF5qrK6fzFf6uVVb5K2PXVa1Phv1fu1oh+K3HWzbqUrsRRn\r
+ JBpqMRcVJwIA+UkhNfMCAAA=\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 15:48:10 -0000\r
+\r
+Just a nit: It would be nice to also replace _json with _sprinter in\r
+devel/schemata (those cross-references are always out of date anyway,\r
+but might as well try).\r
+\r
+On Thu, 06 Dec 2012, Peter Feigl <craven@gmx.net> wrote:\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
+> notmuch-client.h | 8 ++++----\r
+> notmuch-reply.c | 43 ++++++++++++++++++++++++++-----------------\r
+> notmuch-show.c | 30 +++++++++++++++---------------\r
+> 3 files changed, 45 insertions(+), 36 deletions(-)\r
+>\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..6103d6e 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..38c621f 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
+> +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,7 +208,7 @@ _is_from_line (const char *line)\r
+> }\r
+> \r
+> void\r
+> -format_headers_json (sprinter_t *sp, GMimeMessage *message,\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
+> @@ -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,7 +595,7 @@ 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
+> +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
+> @@ -603,15 +603,15 @@ format_part_json (const void *ctx, sprinter_t *sp, mime_node_t *node,\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
+> +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
+> _______________________________________________\r
+> notmuch mailing list\r
+> notmuch@notmuchmail.org\r
+> http://notmuchmail.org/mailman/listinfo/notmuch\r
projects / notmuch-archives.git / commitdiff