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 3943C431E84 for ; Tue, 24 Jul 2012 19:35:07 -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 vmArrnYkrLYC for ; Tue, 24 Jul 2012 19:35:06 -0700 (PDT) Received: from dmz-mailsec-scanner-3.mit.edu (DMZ-MAILSEC-SCANNER-3.MIT.EDU [18.9.25.14]) by olra.theworths.org (Postfix) with ESMTP id E44E8431FC4 for ; Tue, 24 Jul 2012 19:35:05 -0700 (PDT) X-AuditID: 1209190e-b7fb56d0000008b2-fc-500f5b59f0f4 Received: from mailhub-auth-1.mit.edu ( [18.9.21.35]) by dmz-mailsec-scanner-3.mit.edu (Symantec Messaging Gateway) with SMTP id 33.7F.02226.95B5F005; Tue, 24 Jul 2012 22:35:05 -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 q6P2Z5Yt011177; Tue, 24 Jul 2012 22:35:05 -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 q6P2Z2rC025131 (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT); Tue, 24 Jul 2012 22:35:04 -0400 (EDT) Received: from amthrax by drake.dyndns.org with local (Exim 4.77) (envelope-from ) id 1StrRG-0004aH-RO; Tue, 24 Jul 2012 22:35:02 -0400 From: Austin Clements To: notmuch@notmuchmail.org Subject: [PATCH 12/13] show: Convert do_show to use sprinter Date: Tue, 24 Jul 2012 22:34:52 -0400 Message-Id: <1343183693-17134-13-git-send-email-amdragon@mit.edu> X-Mailer: git-send-email 1.7.10 In-Reply-To: <1343183693-17134-1-git-send-email-amdragon@mit.edu> References: <1343183693-17134-1-git-send-email-amdragon@mit.edu> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFtrHIsWRmVeSWpSXmKPExsUixCmqrBsZzR9g8P+BgsXehnZGi+s3ZzI7 MHks3rSfzePZqlvMAUxRXDYpqTmZZalF+nYJXBm3fixnKvjFWfH75AfWBsZH7F2MnBwSAiYS rSeOMELYYhIX7q1n62Lk4hAS2McoceD/JiYIZwOjxItrexkhnEdMEpt+TYfKzGWUmDvrFdgs NgENiW37l4PNEhGQlth5dzYriM0sYCYx9+dENhBbWMBG4uvc+ywgNouAqsT29d3MIDavgKPE st+7mSDukJd4er8PrJ4TKH5+yUKwmUICDhI9i6+xT2DkX8DIsIpRNiW3Sjc3MTOnODVZtzg5 MS8vtUjXWC83s0QvNaV0EyM4mCT5djB+Pah0iFGAg1GJh/f3E74AIdbEsuLK3EOMkhxMSqK8 FcH8AUJ8SfkplRmJxRnxRaU5qcWHGCU4mJVEeIvCgHK8KYmVValF+TApaQ4WJXHeKyk3/YUE 0hNLUrNTUwtSi2CyMhwcShK8rVFAjYJFqempFWmZOSUIaSYOTpDhPEDDd4PU8BYXJOYWZ6ZD 5E8xKkqJ884FSQiAJDJK8+B6YdH+ilEc6BVh3maQKh5gooDrfgU0mAlo8PMwPpDBJYkIKakG RpXCwyHa8YfEGuN2NPyrXXUirXhyh6nH+n6OAsFdzm2HxN6mvbTNLXvF9+eNdZD8+ee/9stu 5zRIPb68dnIGs1bP96cnj0br5c05fHjp4kbjZxZSx/k2z+vu0IvUv/uxjuux8rdz057v8/l3 K/HGLjGmb0UPcrX0egqv7J49s/h1lYcfT/plNyWW4oxEQy3mouJEALwzeaDRAgAA 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: Wed, 25 Jul 2012 02:35:07 -0000 --- notmuch-show.c | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/notmuch-show.c b/notmuch-show.c index 5ee2156..a0da48a 100644 --- a/notmuch-show.c +++ b/notmuch-show.c @@ -961,11 +961,9 @@ do_show (void *ctx, notmuch_threads_t *threads; notmuch_thread_t *thread; notmuch_messages_t *messages; - int first_toplevel = 1; notmuch_status_t status, res = NOTMUCH_STATUS_SUCCESS; - if (format->message_set_start) - fputs (format->message_set_start, stdout); + sp->begin_list (sp); for (threads = notmuch_query_search_threads (query); notmuch_threads_valid (threads); @@ -979,10 +977,6 @@ do_show (void *ctx, INTERNAL_ERROR ("Thread %s has no toplevel messages.\n", notmuch_thread_get_thread_id (thread)); - if (!first_toplevel && format->message_set_sep) - fputs (format->message_set_sep, stdout); - first_toplevel = 0; - status = show_messages (ctx, format, sp, messages, 0, params); if (status && !res) res = status; @@ -991,8 +985,7 @@ do_show (void *ctx, } - if (format->message_set_end) - fputs (format->message_set_end, stdout); + sp->end (sp); return res != NOTMUCH_STATUS_SUCCESS; } -- 1.7.10