[PATCH v3 00/13] Convert notmuch show to use structure printers

diff --git a/42/550b26b3dc1c70a1d6578491db6eeb9014d848 b/42/550b26b3dc1c70a1d6578491db6eeb9014d848
new file mode 100644 (file)
index 0000000..86278fd
--- /dev/null
+++ b/42/550b26b3dc1c70a1d6578491db6eeb9014d848
@@ -0,0 +1,118 @@
+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 01D2B429E4C\r
+       for <notmuch@notmuchmail.org>; Thu,  2 Aug 2012 18:15:15 -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 QwjCuRxFoHH6 for <notmuch@notmuchmail.org>;\r
+       Thu,  2 Aug 2012 18:15:12 -0700 (PDT)\r
+Received: from dmz-mailsec-scanner-7.mit.edu (DMZ-MAILSEC-SCANNER-7.MIT.EDU\r
+       [18.7.68.36])\r
+       by olra.theworths.org (Postfix) with ESMTP id 800CA429E26\r
+       for <notmuch@notmuchmail.org>; Thu,  2 Aug 2012 18:15:08 -0700 (PDT)\r
+X-AuditID: 12074424-b7fa06d0000008c2-c4-501b261bb2b6\r
+Received: from mailhub-auth-1.mit.edu ( [18.9.21.35])\r
+       by dmz-mailsec-scanner-7.mit.edu (Symantec Messaging Gateway) with SMTP\r
+       id 35.5C.02242.B162B105; Thu,  2 Aug 2012 21:15:07 -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 q731F6f4012763; \r
+       Thu, 2 Aug 2012 21:15:06 -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 q731F4Au002783\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 1Sx6Tn-0003w7-UZ; Thu, 02 Aug 2012 21:15:03 -0400\r
+From: Austin Clements <amdragon@MIT.EDU>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH v3 00/13] Convert notmuch show to use structure printers\r
+Date: Thu,  2 Aug 2012 21:14:46 -0400\r
+Message-Id: <1343956499-14543-1-git-send-email-amdragon@mit.edu>\r
+X-Mailer: git-send-email 1.7.10\r
+X-Brightmail-Tracker:\r
+ H4sIAAAAAAAAA+NgFlrDIsWRmVeSWpSXmKPExsUixCmqrCutJh1gMPe1hMXquTwW12/OZLZ4\r
+       s3IeqwOzx85Zd9k9Dn9dyOLxbNUt5gDmKC6blNSczLLUIn27BK6MrgtnWAvu8FZc67nA3MC4\r
+       gbuLkZNDQsBEYu6Jt2wQtpjEhXvrgWwuDiGBfYwSu76eYwZJCAmsZ5Q4M8MSIvGQSeLQp80s\r
+       EIm5jBJrH9aC2GwCGhLb9i9nBLFFBKQldt6dzQpiMwsYSlz+2gFWLyzgIdG15wtYDYuAqsTi\r
+       /e1ANgcHr4CDxNVHGhBHyEs8vd/HNoGRdwEjwypG2ZTcKt3cxMyc4tRk3eLkxLy81CJdc73c\r
+       zBK91JTSTYygQGF3UdnB2HxI6RCjAAejEg+vkaR0gBBrYllxZe4hRkkOJiVRXmYloBBfUn5K\r
+       ZUZicUZ8UWlOavEhRgkOZiUR3qolUgFCvCmJlVWpRfkwKWkOFiVx3uspN/2FBNITS1KzU1ML\r
+       UotgsjIcHEoSvMGqQEMFi1LTUyvSMnNKENJMHJwgw3mAhtuD1PAWFyTmFmemQ+RPMSpKifOm\r
+       gyQEQBIZpXlwvbBIfsUoDvSKMK8XSBUPMAnAdb8CGswENNjODOTq4pJEhJRUA+NhaY7muBMb\r
+       vjv93+R7wub32z0pF/7nX+JP7Z64yU55omQtmy8L45Zb+u29HpektquXWzsdmyokeHNjjcC2\r
+       XyKPfdle/uiXyfE0PKvgm5WxxqNqSY3XxEK5CUXfFHpfhN14IFjVdS498UbnPLbdeqwpive3\r
+       dMuY9hZsrnCNV3s1c6fltQ8XMpRYijMSDbWYi4oTAUbwaGC/AgAA\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:15 -0000\r
+\r
+Relative to version 2 [0], this version fixes a duplicate typedef of\r
+struct sprinter that was not standards compliant and failed to compile\r
+on older gccs [1] (thanks to Tomi for discovering that and figuring\r
+out what was going on).\r
+\r
+The diff relative to version 2 follows.\r
+\r
+[0] id:"1343449754-9010-1-git-send-email-amdragon@mit.edu"\r
+\r
+[1] http://stackoverflow.com/questions/8594954/repeated-typedefs-invalid-in-c-but-valid-in-c\r
+\r
+diff --git a/notmuch-client.h b/notmuch-client.h\r
+index de31aa1..ae9344b 100644\r
+--- a/notmuch-client.h\r
++++ b/notmuch-client.h\r
+@@ -66,12 +66,12 @@ typedef GMimeCipherContext notmuch_crypto_context_t;\r
+ #define STRINGIFY_(s) #s\r
+ \r
+ typedef struct mime_node mime_node_t;\r
+-typedef struct sprinter sprinter_t;\r
++struct sprinter;\r
+ struct notmuch_show_params;\r
+ \r
+ typedef struct notmuch_show_format {\r
+-    sprinter_t *(*new_sprinter) (const void *ctx, FILE *stream);\r
+-    notmuch_status_t (*part) (const void *ctx, sprinter_t *sprinter,\r
++    struct sprinter *(*new_sprinter) (const void *ctx, FILE *stream);\r
++    notmuch_status_t (*part) (const void *ctx, struct sprinter *sprinter,\r
+                             struct mime_node *node, int indent,\r
+                             const struct notmuch_show_params *params);\r
+ } notmuch_show_format_t;\r
+@@ -175,11 +175,11 @@ notmuch_status_t\r
+ show_one_part (const char *filename, int part);\r
+ \r
+ void\r
+-format_part_json (const void *ctx, sprinter_t *sp, mime_node_t *node,\r
++format_part_json (const void *ctx, struct sprinter *sp, mime_node_t *node,\r
+                 notmuch_bool_t first, notmuch_bool_t output_body);\r
+ \r
+ void\r
+-format_headers_json (sprinter_t *sp, GMimeMessage *message,\r
++format_headers_json (struct sprinter *sp, GMimeMessage *message,\r
+                    notmuch_bool_t reply);\r
+ \r
+ typedef enum {\r
+\r
+\r