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

diff --git a/04/de2c99f75e57be5e21229500632db5b91b73f4 b/04/de2c99f75e57be5e21229500632db5b91b73f4
new file mode 100644 (file)
index 0000000..55fbd95
--- /dev/null
+++ b/04/de2c99f75e57be5e21229500632db5b91b73f4
@@ -0,0 +1,119 @@
+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 AC4D9431FB6\r
+       for <notmuch@notmuchmail.org>; Fri, 27 Jul 2012 21:29:44 -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 FtsvRFwAv8bA for <notmuch@notmuchmail.org>;\r
+       Fri, 27 Jul 2012 21:29:44 -0700 (PDT)\r
+Received: from dmz-mailsec-scanner-8.mit.edu (DMZ-MAILSEC-SCANNER-8.MIT.EDU\r
+       [18.7.68.37])\r
+       by olra.theworths.org (Postfix) with ESMTP id 9015C431FCB\r
+       for <notmuch@notmuchmail.org>; Fri, 27 Jul 2012 21:29:28 -0700 (PDT)\r
+X-AuditID: 12074425-b7f9b6d0000008c4-9d-50136aa83a6d\r
+Received: from mailhub-auth-2.mit.edu ( [18.7.62.36])\r
+       by dmz-mailsec-scanner-8.mit.edu (Symantec Messaging Gateway) with SMTP\r
+       id 76.70.02244.8AA63105; Sat, 28 Jul 2012 00:29:28 -0400 (EDT)\r
+Received: from outgoing.mit.edu (OUTGOING-AUTH.MIT.EDU [18.7.22.103])\r
+       by mailhub-auth-2.mit.edu (8.13.8/8.9.2) with ESMTP id q6S4TREt002962; \r
+       Sat, 28 Jul 2012 00:29:27 -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 q6S4TL6o027363\r
+       (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT);\r
+       Sat, 28 Jul 2012 00:29:22 -0400 (EDT)\r
+Received: from amthrax by drake.dyndns.org with local (Exim 4.77)\r
+       (envelope-from <amdragon@mit.edu>)\r
+       id 1SuyeW-0002XG-Uj; Sat, 28 Jul 2012 00:29:20 -0400\r
+From: Austin Clements <amdragon@MIT.EDU>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH v2 12/13] show: Convert do_show to use sprinter\r
+Date: Sat, 28 Jul 2012 00:29:13 -0400\r
+Message-Id: <1343449754-9010-13-git-send-email-amdragon@mit.edu>\r
+X-Mailer: git-send-email 1.7.10\r
+In-Reply-To: <1343449754-9010-1-git-send-email-amdragon@mit.edu>\r
+References: <1343449754-9010-1-git-send-email-amdragon@mit.edu>\r
+X-Brightmail-Tracker:\r
+ H4sIAAAAAAAAA+NgFjrLIsWRmVeSWpSXmKPExsUixG6norsiSzjAoGUBi8XehnZGi9VzeSyu\r
+       35zJbPFm5TxWBxaPnbPusnss3rSfzePw14UsHs9W3WIOYInisklJzcksSy3St0vgyujZfYGt\r
+       4Bdnxe2ZX9gaGB+xdzFyckgImEi8vvqCFcIWk7hwbz1bFyMXh5DAPkaJZ9MuQjkbGCVWtLaC\r
+       dQgJPGKSWD9dDiIxl1HiwftWNpAEm4CGxLb9yxlBbBEBaYmdd2cDjeXgYBbIk3i8VgLEFBaw\r
+       lzjUUg1SwSKgKjH3xkc2kDCvgIPE/iepEDfISzy93wc2kBMovPnlB2aIrfYSuydvYJ3AyL+A\r
+       kWEVo2xKbpVubmJmTnFqsm5xcmJeXmqRroVebmaJXmpK6SZGcKi5qO5gnHBI6RCjAAejEg/v\r
+       qStCAUKsiWXFlbmHGCU5mJREeaPChQOE+JLyUyozEosz4otKc1KLDzFKcDArifDuFATK8aYk\r
+       VlalFuXDpKQ5WJTEeW+k3PQXEkhPLEnNTk0tSC2CycpwcChJ8G7PBGoULEpNT61Iy8wpQUgz\r
+       cXCCDOcBGr4GpIa3uCAxtzgzHSJ/ilFRSpx3EkhCACSRUZoH1wtLBa8YxYFeEea9BlLFA0wj\r
+       cN2vgAYzAQ22iBYCGVySiJCSamAUPf7UU1WwT8NmxV7jPS8Trx7f8GFXSWeZm5tfwS+T6tbv\r
+       rdHL5nrYrT/htYRVWnPDZCOb2fNWHRS7qhl2c8rS1fZrpt/j2dT8WLUypo7tXlDVtSOvhRKr\r
+       Yg6Y1K6e5m34U2S7rmWTrrbe9r9u9/+aRd3POfrGZLqkkWTgnwbtZEaZWW/r6qyVWIozEg21\r
+       mIuKEwF7z+L64AIAAA==\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: Sat, 28 Jul 2012 04:29:45 -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