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

diff --git a/b8/d039791f63f9ef272c75be88dc6fc106c8f1f3 b/b8/d039791f63f9ef272c75be88dc6fc106c8f1f3
new file mode 100644 (file)
index 0000000..515c13e
--- /dev/null
+++ b/b8/d039791f63f9ef272c75be88dc6fc106c8f1f3
@@ -0,0 +1,117 @@
+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 3943C431E84\r
+       for <notmuch@notmuchmail.org>; Tue, 24 Jul 2012 19:35:07 -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 vmArrnYkrLYC for <notmuch@notmuchmail.org>;\r
+       Tue, 24 Jul 2012 19:35:06 -0700 (PDT)\r
+Received: from dmz-mailsec-scanner-3.mit.edu (DMZ-MAILSEC-SCANNER-3.MIT.EDU\r
+       [18.9.25.14])\r
+       by olra.theworths.org (Postfix) with ESMTP id E44E8431FC4\r
+       for <notmuch@notmuchmail.org>; Tue, 24 Jul 2012 19:35:05 -0700 (PDT)\r
+X-AuditID: 1209190e-b7fb56d0000008b2-fc-500f5b59f0f4\r
+Received: from mailhub-auth-1.mit.edu ( [18.9.21.35])\r
+       by dmz-mailsec-scanner-3.mit.edu (Symantec Messaging Gateway) with SMTP\r
+       id 33.7F.02226.95B5F005; Tue, 24 Jul 2012 22:35:05 -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 q6P2Z5Yt011177; \r
+       Tue, 24 Jul 2012 22:35:05 -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 q6P2Z2rC025131\r
+       (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT);\r
+       Tue, 24 Jul 2012 22:35:04 -0400 (EDT)\r
+Received: from amthrax by drake.dyndns.org with local (Exim 4.77)\r
+       (envelope-from <amdragon@mit.edu>)\r
+       id 1StrRG-0004aH-RO; Tue, 24 Jul 2012 22:35:02 -0400\r
+From: Austin Clements <amdragon@MIT.EDU>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH 12/13] show: Convert do_show to use sprinter\r
+Date: Tue, 24 Jul 2012 22:34:52 -0400\r
+Message-Id: <1343183693-17134-13-git-send-email-amdragon@mit.edu>\r
+X-Mailer: git-send-email 1.7.10\r
+In-Reply-To: <1343183693-17134-1-git-send-email-amdragon@mit.edu>\r
+References: <1343183693-17134-1-git-send-email-amdragon@mit.edu>\r
+X-Brightmail-Tracker:\r
+ H4sIAAAAAAAAA+NgFtrHIsWRmVeSWpSXmKPExsUixCmqrBsZzR9g8P+BgsXehnZGi+s3ZzI7\r
+       MHks3rSfzePZqlvMAUxRXDYpqTmZZalF+nYJXBm3fixnKvjFWfH75AfWBsZH7F2MnBwSAiYS\r
+       rSeOMELYYhIX7q1n62Lk4hAS2McoceD/JiYIZwOjxItrexkhnEdMEpt+TYfKzGWUmDvrFdgs\r
+       NgENiW37l4PNEhGQlth5dzYriM0sYCYx9+dENhBbWMBG4uvc+ywgNouAqsT29d3MIDavgKPE\r
+       st+7mSDukJd4er8PrJ4TKH5+yUKwmUICDhI9i6+xT2DkX8DIsIpRNiW3Sjc3MTOnODVZtzg5\r
+       MS8vtUjXWC83s0QvNaV0EyM4mCT5djB+Pah0iFGAg1GJh/f3E74AIdbEsuLK3EOMkhxMSqK8\r
+       FcH8AUJ8SfkplRmJxRnxRaU5qcWHGCU4mJVEeIvCgHK8KYmVValF+TApaQ4WJXHeKyk3/YUE\r
+       0hNLUrNTUwtSi2CyMhwcShK8rVFAjYJFqempFWmZOSUIaSYOTpDhPEDDd4PU8BYXJOYWZ6ZD\r
+       5E8xKkqJ884FSQiAJDJK8+B6YdH+ilEc6BVh3maQKh5gooDrfgU0mAlo8PMwPpDBJYkIKakG\r
+       RpXCwyHa8YfEGuN2NPyrXXUirXhyh6nH+n6OAsFdzm2HxN6mvbTNLXvF9+eNdZD8+ee/9stu\r
+       5zRIPb68dnIGs1bP96cnj0br5c05fHjp4kbjZxZSx/k2z+vu0IvUv/uxjuux8rdz057v8/l3\r
+       K/HGLjGmb0UPcrX0egqv7J49s/h1lYcfT/plNyWW4oxEQy3mouJEALwzeaDRAgAA\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: Wed, 25 Jul 2012 02:35:07 -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 5ee2156..a0da48a 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