[PATCH v3 12/13] show: Convert do_show to use sprinter

diff --git a/13/24948591b16d1dd017eac063e53e78cda07360 b/13/24948591b16d1dd017eac063e53e78cda07360
new file mode 100644 (file)
index 0000000..bc03f7a
--- /dev/null
+++ b/13/24948591b16d1dd017eac063e53e78cda07360
@@ -0,0 +1,118 @@
+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 C2D51429E37\r
+       for <notmuch@notmuchmail.org>; Thu,  2 Aug 2012 18:15:34 -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 qYsxmmocphoN for <notmuch@notmuchmail.org>;\r
+       Thu,  2 Aug 2012 18:15:33 -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 CF643429E43\r
+       for <notmuch@notmuchmail.org>; Thu,  2 Aug 2012 18:15:11 -0700 (PDT)\r
+X-AuditID: 12074422-b7f1f6d00000090b-ea-501b261f1c4e\r
+Received: from mailhub-auth-3.mit.edu ( [18.9.21.43])\r
+       by dmz-mailsec-scanner-5.mit.edu (Symantec Messaging Gateway) with SMTP\r
+       id EA.20.02315.F162B105; Thu,  2 Aug 2012 21:15:11 -0400 (EDT)\r
+Received: from outgoing.mit.edu (OUTGOING-AUTH.MIT.EDU [18.7.22.103])\r
+       by mailhub-auth-3.mit.edu (8.13.8/8.9.2) with ESMTP id q731FBF8008957; \r
+       Thu, 2 Aug 2012 21:15:11 -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 q731F45r002795\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-0003wd-IW; Thu, 02 Aug 2012 21:15:04 -0400\r
+From: Austin Clements <amdragon@MIT.EDU>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH v3 12/13] show: Convert do_show to use sprinter\r
+Date: Thu,  2 Aug 2012 21:14:58 -0400\r
+Message-Id: <1343956499-14543-13-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+NgFjrOIsWRmVeSWpSXmKPExsUixCmqrSuvJh1g8OGVpsXquTwW12/OZLZ4\r
+       s3IeqwOzx85Zd9k9Dn9dyOLxbNUt5gDmKC6blNSczLLUIn27BK6Mnt0X2Ap+cVbcnvmFrYHx\r
+       EXsXIyeHhICJxKxD/xkhbDGJC/fWs3UxcnEICexjlJjy9hCUs55RovfBaVYI5yGTxP+HH9gh\r
+       nLmMEgueXmAF6WcT0JDYtn852CwRAWmJnXdng8WZBeIktkyB2CEsYC+x4fdlNhCbRUBV4tW/\r
+       72B38Ao4SpzcspAJ4g55iaf3+8BqOIHir9++AusVEnCQWN7WzTqBkX8BI8MqRtmU3Crd3MTM\r
+       nOLUZN3i5MS8vNQiXVO93MwSvdSU0k2MoPBid1HawfjzoNIhRgEORiUeXmNJ6QAh1sSy4src\r
+       Q4ySHExKorzMSkAhvqT8lMqMxOKM+KLSnNTiQ4wSHMxKIrxVS6QChHhTEiurUovyYVLSHCxK\r
+       4rzXUm76CwmkJ5akZqemFqQWwWRlODiUJHj7VIGGChalpqdWpGXmlCCkmTg4QYbzAA3fDlLD\r
+       W1yQmFucmQ6RP8WoKCXOmw6SEABJZJTmwfXC4v8VozjQK8K87SBVPMDUAdf9CmgwE9BgOzOQ\r
+       q4tLEhFSUg2MkzjCLKwiWt2OLxNL0+hu77bw1EroZ5XevSmvgNvQ83bej3NbuFfdfVV3bbPd\r
+       WoMzF1rSDhT9WdbzueKlwPHWCxrd7/xcGlzvBmluOTkzjW/lWq0nwROFOrhdb3RfeWVqZ3tE\r
+       v5/5asAEgbOXs39s1DZs7nmcsMozdHJpg1FFs5f6zlCleHklluKMREMt5qLiRAAlToi+2gIA        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:35 -0000\r
+\r
+---\r
+ notmuch-show.c |   11 ++---------\r
+ 1 file changed, 2 insertions(+), 9 deletions(-)\r
+\r
+diff --git a/notmuch-show.c b/notmuch-show.c\r
+index ec3e861..89bf2e7 100644\r
+--- a/notmuch-show.c\r
++++ b/notmuch-show.c\r
+@@ -961,11 +961,9 @@ do_show (void *ctx,\r
+     notmuch_threads_t *threads;\r
+     notmuch_thread_t *thread;\r
+     notmuch_messages_t *messages;\r
+-    int first_toplevel = 1;\r
+     notmuch_status_t status, res = NOTMUCH_STATUS_SUCCESS;\r
+ \r
+-    if (format->message_set_start)\r
+-      fputs (format->message_set_start, stdout);\r
++    sp->begin_list (sp);\r
+ \r
+     for (threads = notmuch_query_search_threads (query);\r
+        notmuch_threads_valid (threads);\r
+@@ -979,10 +977,6 @@ do_show (void *ctx,\r
+           INTERNAL_ERROR ("Thread %s has no toplevel messages.\n",\r
+                           notmuch_thread_get_thread_id (thread));\r
+ \r
+-      if (!first_toplevel && format->message_set_sep)\r
+-          fputs (format->message_set_sep, stdout);\r
+-      first_toplevel = 0;\r
+-\r
+       status = show_messages (ctx, format, sp, messages, 0, params);\r
+       if (status && !res)\r
+           res = status;\r
+@@ -991,8 +985,7 @@ do_show (void *ctx,\r
+ \r
+     }\r
+ \r
+-    if (format->message_set_end)\r
+-      fputs (format->message_set_end, stdout);\r
++    sp->end (sp);\r
+ \r
+     return res != NOTMUCH_STATUS_SUCCESS;\r
+ }\r
+-- \r
+1.7.10\r
+\r