b8/d039791f63f9ef272c75be88dc6fc106c8f1f3

   1 Return-Path: <amdragon@mit.edu>\r
   2 X-Original-To: notmuch@notmuchmail.org\r
   3 Delivered-To: notmuch@notmuchmail.org\r
   4 Received: from localhost (localhost [127.0.0.1])\r
   5         by olra.theworths.org (Postfix) with ESMTP id 3943C431E84\r
   6         for <notmuch@notmuchmail.org>; Tue, 24 Jul 2012 19:35:07 -0700 (PDT)\r
   7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
   8 X-Spam-Flag: NO\r
   9 X-Spam-Score: -0.7\r
  10 X-Spam-Level: \r
  11 X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5\r
  12         tests=[RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled\r
  13 Received: from olra.theworths.org ([127.0.0.1])\r
  14         by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
  15         with ESMTP id vmArrnYkrLYC for <notmuch@notmuchmail.org>;\r
  16         Tue, 24 Jul 2012 19:35:06 -0700 (PDT)\r
  17 Received: from dmz-mailsec-scanner-3.mit.edu (DMZ-MAILSEC-SCANNER-3.MIT.EDU\r
  18         [18.9.25.14])\r
  19         by olra.theworths.org (Postfix) with ESMTP id E44E8431FC4\r
  20         for <notmuch@notmuchmail.org>; Tue, 24 Jul 2012 19:35:05 -0700 (PDT)\r
  21 X-AuditID: 1209190e-b7fb56d0000008b2-fc-500f5b59f0f4\r
  22 Received: from mailhub-auth-1.mit.edu ( [18.9.21.35])\r
  23         by dmz-mailsec-scanner-3.mit.edu (Symantec Messaging Gateway) with SMTP\r
  24         id 33.7F.02226.95B5F005; Tue, 24 Jul 2012 22:35:05 -0400 (EDT)\r
  25 Received: from outgoing.mit.edu (OUTGOING-AUTH.MIT.EDU [18.7.22.103])\r
  26         by mailhub-auth-1.mit.edu (8.13.8/8.9.2) with ESMTP id q6P2Z5Yt011177; \r
  27         Tue, 24 Jul 2012 22:35:05 -0400\r
  28 Received: from drake.dyndns.org\r
  29         (209-6-116-242.c3-0.arl-ubr1.sbo-arl.ma.cable.rcn.com\r
  30         [209.6.116.242]) (authenticated bits=0)\r
  31         (User authenticated as amdragon@ATHENA.MIT.EDU)\r
  32         by outgoing.mit.edu (8.13.6/8.12.4) with ESMTP id q6P2Z2rC025131\r
  33         (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT);\r
  34         Tue, 24 Jul 2012 22:35:04 -0400 (EDT)\r
  35 Received: from amthrax by drake.dyndns.org with local (Exim 4.77)\r
  36         (envelope-from <amdragon@mit.edu>)\r
  37         id 1StrRG-0004aH-RO; Tue, 24 Jul 2012 22:35:02 -0400\r
  38 From: Austin Clements <amdragon@MIT.EDU>\r
  39 To: notmuch@notmuchmail.org\r
  40 Subject: [PATCH 12/13] show: Convert do_show to use sprinter\r
  41 Date: Tue, 24 Jul 2012 22:34:52 -0400\r
  42 Message-Id: <1343183693-17134-13-git-send-email-amdragon@mit.edu>\r
  43 X-Mailer: git-send-email 1.7.10\r
  44 In-Reply-To: <1343183693-17134-1-git-send-email-amdragon@mit.edu>\r
  45 References: <1343183693-17134-1-git-send-email-amdragon@mit.edu>\r
  46 X-Brightmail-Tracker:\r
  47  H4sIAAAAAAAAA+NgFtrHIsWRmVeSWpSXmKPExsUixCmqrBsZzR9g8P+BgsXehnZGi+s3ZzI7\r
  48         MHks3rSfzePZqlvMAUxRXDYpqTmZZalF+nYJXBm3fixnKvjFWfH75AfWBsZH7F2MnBwSAiYS\r
  49         rSeOMELYYhIX7q1n62Lk4hAS2McoceD/JiYIZwOjxItrexkhnEdMEpt+TYfKzGWUmDvrFdgs\r
  50         NgENiW37l4PNEhGQlth5dzYriM0sYCYx9+dENhBbWMBG4uvc+ywgNouAqsT29d3MIDavgKPE\r
  51         st+7mSDukJd4er8PrJ4TKH5+yUKwmUICDhI9i6+xT2DkX8DIsIpRNiW3Sjc3MTOnODVZtzg5\r
  52         MS8vtUjXWC83s0QvNaV0EyM4mCT5djB+Pah0iFGAg1GJh/f3E74AIdbEsuLK3EOMkhxMSqK8\r
  53         FcH8AUJ8SfkplRmJxRnxRaU5qcWHGCU4mJVEeIvCgHK8KYmVValF+TApaQ4WJXHeKyk3/YUE\r
  54         0hNLUrNTUwtSi2CyMhwcShK8rVFAjYJFqempFWmZOSUIaSYOTpDhPEDDd4PU8BYXJOYWZ6ZD\r
  55         5E8xKkqJ884FSQiAJDJK8+B6YdH+ilEc6BVh3maQKh5gooDrfgU0mAlo8PMwPpDBJYkIKakG\r
  56         RpXCwyHa8YfEGuN2NPyrXXUirXhyh6nH+n6OAsFdzm2HxN6mvbTNLXvF9+eNdZD8+ee/9stu\r
  57         5zRIPb68dnIGs1bP96cnj0br5c05fHjp4kbjZxZSx/k2z+vu0IvUv/uxjuux8rdz057v8/l3\r
  58         K/HGLjGmb0UPcrX0egqv7J49s/h1lYcfT/plNyWW4oxEQy3mouJEALwzeaDRAgAA\r
  59 X-BeenThere: notmuch@notmuchmail.org\r
  60 X-Mailman-Version: 2.1.13\r
  61 Precedence: list\r
  62 List-Id: "Use and development of the notmuch mail system."\r
  63         <notmuch.notmuchmail.org>\r
  64 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
  65         <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
  66 List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
  67 List-Post: <mailto:notmuch@notmuchmail.org>\r
  68 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
  69 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
  70         <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
  71 X-List-Received-Date: Wed, 25 Jul 2012 02:35:07 -0000\r
  72 \r
  73 ---\r
  74  notmuch-show.c |   11 ++---------\r
  75  1 file changed, 2 insertions(+), 9 deletions(-)\r
  76 \r
  77 diff --git a/notmuch-show.c b/notmuch-show.c\r
  78 index 5ee2156..a0da48a 100644\r
  79 --- a/notmuch-show.c\r
  80 +++ b/notmuch-show.c\r
  81 @@ -961,11 +961,9 @@ do_show (void *ctx,\r
  82      notmuch_threads_t *threads;\r
  83      notmuch_thread_t *thread;\r
  84      notmuch_messages_t *messages;\r
  85 -    int first_toplevel = 1;\r
  86      notmuch_status_t status, res = NOTMUCH_STATUS_SUCCESS;\r
  87  \r
  88 -    if (format->message_set_start)\r
  89 -       fputs (format->message_set_start, stdout);\r
  90 +    sp->begin_list (sp);\r
  91  \r
  92      for (threads = notmuch_query_search_threads (query);\r
  93          notmuch_threads_valid (threads);\r
  94 @@ -979,10 +977,6 @@ do_show (void *ctx,\r
  95             INTERNAL_ERROR ("Thread %s has no toplevel messages.\n",\r
  96                             notmuch_thread_get_thread_id (thread));\r
  97  \r
  98 -       if (!first_toplevel && format->message_set_sep)\r
  99 -           fputs (format->message_set_sep, stdout);\r
 100 -       first_toplevel = 0;\r
 101 -\r
 102         status = show_messages (ctx, format, sp, messages, 0, params);\r
 103         if (status && !res)\r
 104             res = status;\r
 105 @@ -991,8 +985,7 @@ do_show (void *ctx,\r
 106  \r
 107      }\r
 108  \r
 109 -    if (format->message_set_end)\r
 110 -       fputs (format->message_set_end, stdout);\r
 111 +    sp->end (sp);\r
 112  \r
 113      return res != NOTMUCH_STATUS_SUCCESS;\r
 114  }\r
 115 -- \r
 116 1.7.10\r
 117 \r