[PATCH v3 11/13] show: Convert show_message to use sprinter

diff --git a/b0/9058710c8f5a9cc746d58af61b04c751fe7dbb b/b0/9058710c8f5a9cc746d58af61b04c751fe7dbb
new file mode 100644 (file)
index 0000000..aaf4166
--- /dev/null
+++ b/b0/9058710c8f5a9cc746d58af61b04c751fe7dbb
@@ -0,0 +1,162 @@
+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 C2C41431E64\r
+       for <notmuch@notmuchmail.org>; Thu,  2 Aug 2012 18:15:39 -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 RNQy8KKnnp0Z for <notmuch@notmuchmail.org>;\r
+       Thu,  2 Aug 2012 18:15:38 -0700 (PDT)\r
+Received: from dmz-mailsec-scanner-1.mit.edu (DMZ-MAILSEC-SCANNER-1.MIT.EDU\r
+       [18.9.25.12])\r
+       by olra.theworths.org (Postfix) with ESMTP id 26EF9429E48\r
+       for <notmuch@notmuchmail.org>; Thu,  2 Aug 2012 18:15:12 -0700 (PDT)\r
+X-AuditID: 1209190c-b7f806d000006b87-21-501b261f92e1\r
+Received: from mailhub-auth-1.mit.edu ( [18.9.21.35])\r
+       by dmz-mailsec-scanner-1.mit.edu (Symantec Messaging Gateway) with SMTP\r
+       id DC.2B.27527.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-1.mit.edu (8.13.8/8.9.2) with ESMTP id q731FBmV012774; \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 q731F4ld002794\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-0003wa-Gv; Thu, 02 Aug 2012 21:15:04 -0400\r
+From: Austin Clements <amdragon@MIT.EDU>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH v3 11/13] show: Convert show_message to use sprinter\r
+Date: Thu,  2 Aug 2012 21:14:57 -0400\r
+Message-Id: <1343956499-14543-12-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+NgFjrGIsWRmVeSWpSXmKPExsUixCmqrCuvJh1gsL3D3GL1XB6L6zdnMlu8\r
+       WTmP1YHZY+esu+weh78uZPF4tuoWcwBzFJdNSmpOZllqkb5dAlfGg3uXmQq6RCqOrbnF1sD4\r
+       lL+LkZNDQsBE4vOnL2wQtpjEhXvrwWwhgX2MEhdveXYxcgHZ6xklrixYwALhPGSSmPPiKxOE\r
+       M5dR4vuG04wgLWwCGhLb9i8Hs0UEpCV23p3NCmIzC8RJbJnyHywuLOAi8XHVarA4i4CqxM3P\r
+       m8HivAKOEld//GCFOENe4un9PrAzOIHir9++YoQ4yUFieVs36wRG/gWMDKsYZVNyq3RzEzNz\r
+       ilOTdYuTE/PyUot0DfVyM0v0UlNKNzGCg0uSZwfjm4NKhxgFOBiVeHhviUkHCLEmlhVX5h5i\r
+       lORgUhLlZVYCCvEl5adUZiQWZ8QXleakFh9ilOBgVhLhrVoiFSDEm5JYWZValA+TkuZgURLn\r
+       vZxy019IID2xJDU7NbUgtQgmK8PBoSTBO18FaKhgUWp6akVaZk4JQpqJgxNkOA/Q8GMgNbzF\r
+       BYm5xZnpEPlTjIpS4ryLQC4SAElklObB9cKi/xWjONArwrxTQdp5gIkDrvsV0GAmoMF2ZiBX\r
+       F5ckIqSkGhhlL8aor1m4p3HyxzkLLix88fJrwJSqDawCZwrPTV29/H/l5LDPAp/sdOIOpcWf\r
+       alv0u7vCMDl73y8ej2XPBMNU8v6FfN12YceZRbe6nog6Hd75+4mrXnGQ8NuPay9UPmKzrzT/\r
+       4apd+d063vkik+1k8z1Ltk5/t2dejnxORJeA8pTDlpsM8yx9lFiKMxINtZiLihMBYsFgotkC        AAA=\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:40 -0000\r
+\r
+Unlike the previous patches, this function is used for all formats.\r
+However, for formats other than the JSON format, the sprinter methods\r
+used by show_message are all no-ops, so this code continues to\r
+function correctly for all of the formats.\r
+\r
+Converting show_message eliminates show_null_message in the process,\r
+since this maps directly to an sprinter method.\r
+---\r
+ notmuch-show.c |   31 +++++--------------------------\r
+ 1 file changed, 5 insertions(+), 26 deletions(-)\r
+\r
+diff --git a/notmuch-show.c b/notmuch-show.c\r
+index b9d9f5d..ec3e861 100644\r
+--- a/notmuch-show.c\r
++++ b/notmuch-show.c\r
+@@ -842,15 +842,6 @@ format_part_raw (unused (const void *ctx), unused (sprinter_t *sp),\r
+ }\r
+ \r
+ static notmuch_status_t\r
+-show_null_message (const notmuch_show_format_t *format)\r
+-{\r
+-    /* Output a null message. Currently empty for all formats except Json */\r
+-    if (format->null_message)\r
+-      printf ("%s", format->null_message);\r
+-    return NOTMUCH_STATUS_SUCCESS;\r
+-}\r
+-\r
+-static notmuch_status_t\r
+ show_message (void *ctx,\r
+             const notmuch_show_format_t *format,\r
+             sprinter_t *sp,\r
+@@ -884,23 +875,16 @@ show_messages (void *ctx,\r
+     notmuch_message_t *message;\r
+     notmuch_bool_t match;\r
+     notmuch_bool_t excluded;\r
+-    int first_set = 1;\r
+     int next_indent;\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 (;\r
+        notmuch_messages_valid (messages);\r
+        notmuch_messages_move_to_next (messages))\r
+     {\r
+-      if (!first_set && format->message_set_sep)\r
+-          fputs (format->message_set_sep, stdout);\r
+-      first_set = 0;\r
+-\r
+-      if (format->message_set_start)\r
+-          fputs (format->message_set_start, stdout);\r
++      sp->begin_list (sp);\r
+ \r
+       message = notmuch_messages_get (messages);\r
+ \r
+@@ -915,12 +899,9 @@ show_messages (void *ctx,\r
+               res = status;\r
+           next_indent = indent + 1;\r
+       } else {\r
+-          status = show_null_message (format);\r
++          sp->null (sp);\r
+       }\r
+ \r
+-      if (!status && format->message_set_sep)\r
+-          fputs (format->message_set_sep, stdout);\r
+-\r
+       status = show_messages (ctx,\r
+                               format, sp,\r
+                               notmuch_message_get_replies (message),\r
+@@ -931,12 +912,10 @@ show_messages (void *ctx,\r
+ \r
+       notmuch_message_destroy (message);\r
+ \r
+-      if (format->message_set_end)\r
+-          fputs (format->message_set_end, stdout);\r
++      sp->end (sp);\r
+     }\r
+ \r
+-    if (format->message_set_end)\r
+-      fputs (format->message_set_end, stdout);\r
++    sp->end (sp);\r
+ \r
+     return res;\r
+ }\r
+-- \r
+1.7.10\r
+\r