Return-Path: X-Original-To: notmuch@notmuchmail.org Delivered-To: notmuch@notmuchmail.org Received: from localhost (localhost [127.0.0.1]) by olra.theworths.org (Postfix) with ESMTP id 11BA5431FC4 for ; Tue, 7 Aug 2012 05:57:18 -0700 (PDT) X-Virus-Scanned: Debian amavisd-new at olra.theworths.org X-Spam-Flag: NO X-Spam-Score: -0.7 X-Spam-Level: X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5 tests=[RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled Received: from olra.theworths.org ([127.0.0.1]) by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id hJMiea4Twxw8 for ; Tue, 7 Aug 2012 05:57:15 -0700 (PDT) Received: from dmz-mailsec-scanner-7.mit.edu (DMZ-MAILSEC-SCANNER-7.MIT.EDU [18.7.68.36]) by olra.theworths.org (Postfix) with ESMTP id B2F09431FAF for ; Tue, 7 Aug 2012 05:57:15 -0700 (PDT) X-AuditID: 12074424-b7fa06d0000008c2-d8-502110ab6a40 Received: from mailhub-auth-1.mit.edu ( [18.9.21.35]) by dmz-mailsec-scanner-7.mit.edu (Symantec Messaging Gateway) with SMTP id A1.BD.02242.BA011205; Tue, 7 Aug 2012 08:57:15 -0400 (EDT) Received: from outgoing.mit.edu (OUTGOING-AUTH.MIT.EDU [18.7.22.103]) by mailhub-auth-1.mit.edu (8.13.8/8.9.2) with ESMTP id q77CvE32024991; Tue, 7 Aug 2012 08:57:14 -0400 Received: from drake.dyndns.org (209-6-116-242.c3-0.arl-ubr1.sbo-arl.ma.cable.rcn.com [209.6.116.242]) (authenticated bits=0) (User authenticated as amdragon@ATHENA.MIT.EDU) by outgoing.mit.edu (8.13.6/8.12.4) with ESMTP id q77CvDrq004545 (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT); Tue, 7 Aug 2012 08:57:14 -0400 (EDT) Received: from amthrax by drake.dyndns.org with local (Exim 4.77) (envelope-from ) id 1SyjLU-0002cg-Qf; Tue, 07 Aug 2012 08:57:12 -0400 From: Austin Clements To: notmuch@notmuchmail.org Subject: [PATCH] reply: Convert JSON format to use sprinter Date: Tue, 7 Aug 2012 08:57:10 -0400 Message-Id: <1344344230-9937-1-git-send-email-amdragon@mit.edu> X-Mailer: git-send-email 1.7.10 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFprJIsWRmVeSWpSXmKPExsUixCmqrLtaQDHA4P1fcYvrN2cyOzB6PFt1 izmAMYrLJiU1J7MstUjfLoEr4+bKLqaCRxwVPbsvsDUwXmHrYuTgkBAwkWi4kdbFyAlkiklc uLceKMzFISSwj1Hi4o5DzBDOekaJ6U/2QGUeMklsW3qCBaRFSGAuo8SMzYkgNpuAhsS2/csZ QWwRAWmJnXdns4JsYBZQk/jTpQISFhawlvhz6hATiM0ioCrx8fdxMJtXwF6i+d0XVogr5CWe 3u9jm8DIu4CRYRWjbEpulW5uYmZOcWqybnFyYl5eapGuuV5uZoleakrpJkZQCLC7qOxgbD6k dIhRgINRiYf3ApdCgBBrYllxZe4hRkkOJiVRXmE+xQAhvqT8lMqMxOKM+KLSnNTiQ4wSHMxK IryHdwKV86YkVlalFuXDpKQ5WJTEea+n3PQXEkhPLEnNTk0tSC2CycpwcChJ8P7kBxoqWJSa nlqRlplTgpBm4uAEGc4DNPwISA1vcUFibnFmOkT+FKOilDjve5CEAEgiozQPrhcWo68YxYFe Eea9D1LFA4xvuO5XQIOZgAZ7y8uBDC5JREhJNTCumTDnTLAsm+38pO5znp/+pUvx/zNYnHI/ WTwrSMXk2Tltu9Z4ffbXb34a89x+YFPL5HJOd0PDpnOW19p/6uRvqGubcGBNuhmfXzNHbezu Sg82seafVoYHVsa/O7x5/UpeyRMzzPn3TzlhvWnBs7up6Xw7HgjM5a61UFsvUMD098dyJx9F 1zQlluKMREMt5qLiRACINDE7rAIAAA== X-BeenThere: notmuch@notmuchmail.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: "Use and development of the notmuch mail system." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 07 Aug 2012 12:57:18 -0000 Almost all of reply was already being formatted using the sprinter. This patch converts the top-level dictionary to use the sprinter interface. --- One last sprinter piece that had slipped through the cracks. notmuch-reply.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/notmuch-reply.c b/notmuch-reply.c index fa6665f..e60a264 100644 --- a/notmuch-reply.c +++ b/notmuch-reply.c @@ -614,20 +614,20 @@ notmuch_reply_format_json(void *ctx, return 1; sp = sprinter_json_create (ctx, stdout); + sp->begin_map (sp); /* The headers of the reply message we've created */ - printf ("{\"reply-headers\": "); + sp->map_key (sp, "reply-headers"); format_headers_json (sp, reply, TRUE); g_object_unref (G_OBJECT (reply)); reply = NULL; /* Start the original */ - printf (", \"original\": "); - + sp->map_key (sp, "original"); format_part_json (ctx, sp, node, TRUE, TRUE); /* End */ - printf ("}\n"); + sp->end (sp); notmuch_message_destroy (message); return 0; -- 1.7.10