--- /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 589F5431FAF\r
+ for <notmuch@notmuchmail.org>; Thu, 2 Aug 2012 18:15:09 -0700 (PDT)\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 bc4P4AXYm3B4 for <notmuch@notmuchmail.org>;\r
+ Thu, 2 Aug 2012 18:15:08 -0700 (PDT)\r
+Received: from dmz-mailsec-scanner-5.mit.edu (DMZ-MAILSEC-SCANNER-5.MIT.EDU\r
+ [18.7.68.34])\r
+ by olra.theworths.org (Postfix) with ESMTP id D46B6431FAE\r
+ for <notmuch@notmuchmail.org>; Thu, 2 Aug 2012 18:15:07 -0700 (PDT)\r
+X-AuditID: 12074422-b7f1f6d00000090b-de-501b261b04f0\r
+Received: from mailhub-auth-1.mit.edu ( [18.9.21.35])\r
+ by dmz-mailsec-scanner-5.mit.edu (Symantec Messaging Gateway) with SMTP\r
+ id C9.20.02315.B162B105; Thu, 2 Aug 2012 21:15:07 -0400 (EDT)\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 q731F6jD012766; \r
+ Thu, 2 Aug 2012 21:15:06 -0400\r
+Received: from drake.dyndns.org\r
+ (209-6-116-242.c3-0.arl-ubr1.sbo-arl.ma.cable.rcn.com\r
+ [209.6.116.242]) (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 q731F4UM002791\r
+ (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT);\r
+ Thu, 2 Aug 2012 21:15:05 -0400 (EDT)\r
+Received: from amthrax by drake.dyndns.org with local (Exim 4.77)\r
+ (envelope-from <amdragon@mit.edu>)\r
+ id 1Sx6To-0003wR-CH; Thu, 02 Aug 2012 21:15:04 -0400\r
+From: Austin Clements <amdragon@MIT.EDU>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH v3 08/13] show: Convert format_part_sigstatus_json to use\r
+ sprinter\r
+Date: Thu, 2 Aug 2012 21:14:54 -0400\r
+Message-Id: <1343956499-14543-9-git-send-email-amdragon@mit.edu>\r
+X-Mailer: git-send-email 1.7.10\r
+In-Reply-To: <1343956499-14543-1-git-send-email-amdragon@mit.edu>\r
+References: <1343956499-14543-1-git-send-email-amdragon@mit.edu>\r
+X-Brightmail-Tracker:\r
+ H4sIAAAAAAAAA+NgFjrOIsWRmVeSWpSXmKPExsUixCmqrCutJh1gMOOnjMXquTwW12/OZLZ4\r
+ s3IeqwOzx85Zd9k9Dn9dyOLxbNUt5gDmKC6blNSczLLUIn27BK6Mzas2sBZcMq2Y3LCSpYHx\r
+ r0YXIyeHhICJxMaNM1khbDGJC/fWs3UxcnEICexjlDj0dS4jhLOeUWL/88dQmYdMEtNff4By\r
+ 5jJKbJ+2BKyfTUBDYtv+5YwgtoiAtMTOu7PB4swCcRJbpvwHiwsLBEmca50JZrMIqEqceHKZ\r
+ CcTmFXCQaOg5AXWHvMTT+31sIDangKPE67evwOqFgGqWt3WzTmDkX8DIsIpRNiW3Sjc3MTOn\r
+ ODVZtzg5MS8vtUjXVC83s0QvNaV0EyMovNhdlHYw/jyodIhRgINRiYfXWFI6QIg1say4MvcQ\r
+ oyQHk5IoL7MSUIgvKT+lMiOxOCO+qDQntfgQowQHs5IIb9USqQAh3pTEyqrUonyYlDQHi5I4\r
+ 77WUm/5CAumJJanZqakFqUUwWRkODiUJ3j5VoKGCRanpqRVpmTklCGkmDk6Q4TxAw7eD1PAW\r
+ FyTmFmemQ+RPMSpKifOmgyQEQBIZpXlwvbD4f8UoDvSKMG87SBUPMHXAdb8CGswENNjODOTq\r
+ 4pJEhJRUAyNnA2vI0mmhzLFbzN5Fnt+2pyZd2/tw927NX/XB3z8ck2Hu+sjA8VRT5NTZgssC\r
+ 5pIdDlXT9/z+yn9K0Pa05MwVnWXvyhxv8VtKsKWuFMn89nHDhypD7vktE51/qX9aVr3DbNva\r
+ YLFtBS93PhRnVJcVZTTbt+zElQbDmbevrKkSm15RpRn+yEqJpTgj0VCLuag4EQAvGA2d2gIA AA==\r
+Cc: tomi.ollila@iki.fi\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: Fri, 03 Aug 2012 01:15:09 -0000\r
+\r
+---\r
+ notmuch-show.c | 118 +++++++++++++++++++++++++++++---------------------------\r
+ 1 file changed, 61 insertions(+), 57 deletions(-)\r
+\r
+diff --git a/notmuch-show.c b/notmuch-show.c\r
+index 9852119..3ff32df 100644\r
+--- a/notmuch-show.c\r
++++ b/notmuch-show.c\r
+@@ -337,134 +337,138 @@ signer_status_to_string (GMimeSignerStatus x)\r
+ \r
+ #ifdef GMIME_ATLEAST_26\r
+ static void\r
+-format_part_sigstatus_json (mime_node_t *node)\r
++format_part_sigstatus_json (sprinter_t *sp, mime_node_t *node)\r
+ {\r
+ GMimeSignatureList *siglist = node->sig_list;\r
+ \r
+- printf ("[");\r
++ sp->begin_list (sp);\r
+ \r
+ if (!siglist) {\r
+- printf ("]");\r
++ sp->end (sp);\r
+ return;\r
+ }\r
+ \r
+- void *ctx_quote = talloc_new (NULL);\r
+ int i;\r
+ for (i = 0; i < g_mime_signature_list_length (siglist); i++) {\r
+ GMimeSignature *signature = g_mime_signature_list_get_signature (siglist, i);\r
+ \r
+- if (i > 0)\r
+- printf (", ");\r
+-\r
+- printf ("{");\r
++ sp->begin_map (sp);\r
+ \r
+ /* status */\r
+ GMimeSignatureStatus status = g_mime_signature_get_status (signature);\r
+- printf ("\"status\": %s",\r
+- json_quote_str (ctx_quote,\r
+- signature_status_to_string (status)));\r
++ sp->map_key (sp, "status");\r
++ sp->string (sp, signature_status_to_string (status));\r
+ \r
+ GMimeCertificate *certificate = g_mime_signature_get_certificate (signature);\r
+ if (status == GMIME_SIGNATURE_STATUS_GOOD) {\r
+- if (certificate)\r
+- printf (", \"fingerprint\": %s", json_quote_str (ctx_quote, g_mime_certificate_get_fingerprint (certificate)));\r
++ if (certificate) {\r
++ sp->map_key (sp, "fingerprint");\r
++ sp->string (sp, g_mime_certificate_get_fingerprint (certificate));\r
++ }\r
+ /* these dates are seconds since the epoch; should we\r
+ * provide a more human-readable format string? */\r
+ time_t created = g_mime_signature_get_created (signature);\r
+- if (created != -1)\r
+- printf (", \"created\": %d", (int) created);\r
++ if (created != -1) {\r
++ sp->map_key (sp, "created");\r
++ sp->integer (sp, created);\r
++ }\r
+ time_t expires = g_mime_signature_get_expires (signature);\r
+- if (expires > 0)\r
+- printf (", \"expires\": %d", (int) expires);\r
++ if (expires > 0) {\r
++ sp->map_key (sp, "expires");\r
++ sp->integer (sp, expires);\r
++ }\r
+ /* output user id only if validity is FULL or ULTIMATE. */\r
+ /* note that gmime is using the term "trust" here, which\r
+ * is WRONG. It's actually user id "validity". */\r
+ if (certificate) {\r
+ const char *name = g_mime_certificate_get_name (certificate);\r
+ GMimeCertificateTrust trust = g_mime_certificate_get_trust (certificate);\r
+- if (name && (trust == GMIME_CERTIFICATE_TRUST_FULLY || trust == GMIME_CERTIFICATE_TRUST_ULTIMATE))\r
+- printf (", \"userid\": %s", json_quote_str (ctx_quote, name));\r
++ if (name && (trust == GMIME_CERTIFICATE_TRUST_FULLY || trust == GMIME_CERTIFICATE_TRUST_ULTIMATE)) {\r
++ sp->map_key (sp, "userid");\r
++ sp->string (sp, name);\r
++ }\r
+ }\r
+ } else if (certificate) {\r
+ const char *key_id = g_mime_certificate_get_key_id (certificate);\r
+- if (key_id)\r
+- printf (", \"keyid\": %s", json_quote_str (ctx_quote, key_id));\r
++ if (key_id) {\r
++ sp->map_key (sp, "keyid");\r
++ sp->string (sp, key_id);\r
++ }\r
+ }\r
+ \r
+ GMimeSignatureError errors = g_mime_signature_get_errors (signature);\r
+ if (errors != GMIME_SIGNATURE_ERROR_NONE) {\r
+- printf (", \"errors\": %d", errors);\r
++ sp->map_key (sp, "errors");\r
++ sp->integer (sp, errors);\r
+ }\r
+ \r
+- printf ("}");\r
++ sp->end (sp);\r
+ }\r
+ \r
+- printf ("]");\r
+-\r
+- talloc_free (ctx_quote);\r
++ sp->end (sp);\r
+ }\r
+ #else\r
+ static void\r
+-format_part_sigstatus_json (mime_node_t *node)\r
++format_part_sigstatus_json (sprinter_t *sp, mime_node_t *node)\r
+ {\r
+ const GMimeSignatureValidity* validity = node->sig_validity;\r
+ \r
+- printf ("[");\r
++ sp->begin_list (sp);\r
+ \r
+ if (!validity) {\r
+- printf ("]");\r
++ sp->end (sp);\r
+ return;\r
+ }\r
+ \r
+ const GMimeSigner *signer = g_mime_signature_validity_get_signers (validity);\r
+- int first = 1;\r
+- void *ctx_quote = talloc_new (NULL);\r
+-\r
+ while (signer) {\r
+- if (first)\r
+- first = 0;\r
+- else\r
+- printf (", ");\r
+-\r
+- printf ("{");\r
++ sp->begin_map (sp);\r
+ \r
+ /* status */\r
+- printf ("\"status\": %s",\r
+- json_quote_str (ctx_quote,\r
+- signer_status_to_string (signer->status)));\r
++ sp->map_key (sp, "status");\r
++ sp->string (sp, signer_status_to_string (signer->status));\r
+ \r
+ if (signer->status == GMIME_SIGNER_STATUS_GOOD)\r
+ {\r
+- if (signer->fingerprint)\r
+- printf (", \"fingerprint\": %s", json_quote_str (ctx_quote, signer->fingerprint));\r
++ if (signer->fingerprint) {\r
++ sp->map_key (sp, "fingerprint");\r
++ sp->string (sp, signer->fingerprint);\r
++ }\r
+ /* these dates are seconds since the epoch; should we\r
+ * provide a more human-readable format string? */\r
+- if (signer->created)\r
+- printf (", \"created\": %d", (int) signer->created);\r
+- if (signer->expires)\r
+- printf (", \"expires\": %d", (int) signer->expires);\r
++ if (signer->created) {\r
++ sp->map_key (sp, "created");\r
++ sp->integer (sp, signer->created);\r
++ }\r
++ if (signer->expires) {\r
++ sp->map_key (sp, "expires");\r
++ sp->integer (sp, signer->expires);\r
++ }\r
+ /* output user id only if validity is FULL or ULTIMATE. */\r
+ /* note that gmime is using the term "trust" here, which\r
+ * is WRONG. It's actually user id "validity". */\r
+ if ((signer->name) && (signer->trust)) {\r
+- if ((signer->trust == GMIME_SIGNER_TRUST_FULLY) || (signer->trust == GMIME_SIGNER_TRUST_ULTIMATE))\r
+- printf (", \"userid\": %s", json_quote_str (ctx_quote, signer->name));\r
++ if ((signer->trust == GMIME_SIGNER_TRUST_FULLY) || (signer->trust == GMIME_SIGNER_TRUST_ULTIMATE)) {\r
++ sp->map_key (sp, "userid");\r
++ sp->string (sp, signer->name);\r
++ }\r
+ }\r
+ } else {\r
+- if (signer->keyid)\r
+- printf (", \"keyid\": %s", json_quote_str (ctx_quote, signer->keyid));\r
++ if (signer->keyid) {\r
++ sp->map_key (sp, "keyid");\r
++ sp->string (sp, signer->keyid);\r
++ }\r
+ }\r
+ if (signer->errors != GMIME_SIGNER_ERROR_NONE) {\r
+- printf (", \"errors\": %d", signer->errors);\r
++ sp->map_key (sp, "errors");\r
++ sp->integer (sp, signer->errors);\r
+ }\r
+ \r
+- printf ("}");\r
++ sp->end (sp);\r
+ signer = signer->next;\r
+ }\r
+ \r
+- printf ("]");\r
+-\r
+- talloc_free (ctx_quote);\r
++ sp->end (sp);\r
+ }\r
+ #endif\r
+ \r
+@@ -607,7 +611,7 @@ format_part_json (const void *ctx, sprinter_t *sp, mime_node_t *node,\r
+ \r
+ if (node->verify_attempted) {\r
+ printf (", \"sigstatus\": ");\r
+- format_part_sigstatus_json (node);\r
++ format_part_sigstatus_json (sp, node);\r
+ }\r
+ \r
+ printf (", \"content-type\": %s",\r
+-- \r
+1.7.10\r
+\r
projects / notmuch-archives.git / commitdiff