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 01D2B429E4C
\r
6 for <notmuch@notmuchmail.org>; Thu, 2 Aug 2012 18:15:15 -0700 (PDT)
\r
7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org
\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 QwjCuRxFoHH6 for <notmuch@notmuchmail.org>;
\r
16 Thu, 2 Aug 2012 18:15:12 -0700 (PDT)
\r
17 Received: from dmz-mailsec-scanner-7.mit.edu (DMZ-MAILSEC-SCANNER-7.MIT.EDU
\r
19 by olra.theworths.org (Postfix) with ESMTP id 800CA429E26
\r
20 for <notmuch@notmuchmail.org>; Thu, 2 Aug 2012 18:15:08 -0700 (PDT)
\r
21 X-AuditID: 12074424-b7fa06d0000008c2-c4-501b261bb2b6
\r
22 Received: from mailhub-auth-1.mit.edu ( [18.9.21.35])
\r
23 by dmz-mailsec-scanner-7.mit.edu (Symantec Messaging Gateway) with SMTP
\r
24 id 35.5C.02242.B162B105; Thu, 2 Aug 2012 21:15:07 -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 q731F6f4012763;
\r
27 Thu, 2 Aug 2012 21:15:06 -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 q731F4Au002783
\r
33 (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT);
\r
34 Thu, 2 Aug 2012 21:15:05 -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 1Sx6Tn-0003w7-UZ; Thu, 02 Aug 2012 21:15:03 -0400
\r
38 From: Austin Clements <amdragon@MIT.EDU>
\r
39 To: notmuch@notmuchmail.org
\r
40 Subject: [PATCH v3 00/13] Convert notmuch show to use structure printers
\r
41 Date: Thu, 2 Aug 2012 21:14:46 -0400
\r
42 Message-Id: <1343956499-14543-1-git-send-email-amdragon@mit.edu>
\r
43 X-Mailer: git-send-email 1.7.10
\r
44 X-Brightmail-Tracker:
\r
45 H4sIAAAAAAAAA+NgFlrDIsWRmVeSWpSXmKPExsUixCmqrCutJh1gMPe1hMXquTwW12/OZLZ4
\r
46 s3IeqwOzx85Zd9k9Dn9dyOLxbNUt5gDmKC6blNSczLLUIn27BK6MrgtnWAvu8FZc67nA3MC4
\r
47 gbuLkZNDQsBEYu6Jt2wQtpjEhXvrgWwuDiGBfYwSu76eYwZJCAmsZ5Q4M8MSIvGQSeLQp80s
\r
48 EIm5jBJrH9aC2GwCGhLb9i9nBLFFBKQldt6dzQpiMwsYSlz+2gFWLyzgIdG15wtYDYuAqsTi
\r
49 /e1ANgcHr4CDxNVHGhBHyEs8vd/HNoGRdwEjwypG2ZTcKt3cxMyc4tRk3eLkxLy81CJdc73c
\r
50 zBK91JTSTYygQGF3UdnB2HxI6RCjAAejEg+vkaR0gBBrYllxZe4hRkkOJiVRXmYloBBfUn5K
\r
51 ZUZicUZ8UWlOavEhRgkOZiUR3qolUgFCvCmJlVWpRfkwKWkOFiVx3uspN/2FBNITS1KzU1ML
\r
52 UotgsjIcHEoSvMGqQEMFi1LTUyvSMnNKENJMHJwgw3mAhtuD1PAWFyTmFmemQ+RPMSpKifOm
\r
53 gyQEQBIZpXlwvbBIfsUoDvSKMK8XSBUPMAnAdb8CGswENNjODOTq4pJEhJRUA+NhaY7muBMb
\r
54 vjv93+R7wub32z0pF/7nX+JP7Z64yU55omQtmy8L45Zb+u29HpektquXWzsdmyokeHNjjcC2
\r
55 XyKPfdle/uiXyfE0PKvgm5WxxqNqSY3XxEK5CUXfFHpfhN14IFjVdS498UbnPLbdeqwpive3
\r
56 dMuY9hZsrnCNV3s1c6fltQ8XMpRYijMSDbWYi4oTAUbwaGC/AgAA
\r
57 Cc: tomi.ollila@iki.fi
\r
58 X-BeenThere: notmuch@notmuchmail.org
\r
59 X-Mailman-Version: 2.1.13
\r
61 List-Id: "Use and development of the notmuch mail system."
\r
62 <notmuch.notmuchmail.org>
\r
63 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
\r
64 <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
\r
65 List-Archive: <http://notmuchmail.org/pipermail/notmuch>
\r
66 List-Post: <mailto:notmuch@notmuchmail.org>
\r
67 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
\r
68 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
\r
69 <mailto:notmuch-request@notmuchmail.org?subject=subscribe>
\r
70 X-List-Received-Date: Fri, 03 Aug 2012 01:15:15 -0000
\r
72 Relative to version 2 [0], this version fixes a duplicate typedef of
\r
73 struct sprinter that was not standards compliant and failed to compile
\r
74 on older gccs [1] (thanks to Tomi for discovering that and figuring
\r
75 out what was going on).
\r
77 The diff relative to version 2 follows.
\r
79 [0] id:"1343449754-9010-1-git-send-email-amdragon@mit.edu"
\r
81 [1] http://stackoverflow.com/questions/8594954/repeated-typedefs-invalid-in-c-but-valid-in-c
\r
83 diff --git a/notmuch-client.h b/notmuch-client.h
\r
84 index de31aa1..ae9344b 100644
\r
85 --- a/notmuch-client.h
\r
86 +++ b/notmuch-client.h
\r
87 @@ -66,12 +66,12 @@ typedef GMimeCipherContext notmuch_crypto_context_t;
\r
88 #define STRINGIFY_(s) #s
\r
90 typedef struct mime_node mime_node_t;
\r
91 -typedef struct sprinter sprinter_t;
\r
93 struct notmuch_show_params;
\r
95 typedef struct notmuch_show_format {
\r
96 - sprinter_t *(*new_sprinter) (const void *ctx, FILE *stream);
\r
97 - notmuch_status_t (*part) (const void *ctx, sprinter_t *sprinter,
\r
98 + struct sprinter *(*new_sprinter) (const void *ctx, FILE *stream);
\r
99 + notmuch_status_t (*part) (const void *ctx, struct sprinter *sprinter,
\r
100 struct mime_node *node, int indent,
\r
101 const struct notmuch_show_params *params);
\r
102 } notmuch_show_format_t;
\r
103 @@ -175,11 +175,11 @@ notmuch_status_t
\r
104 show_one_part (const char *filename, int part);
\r
107 -format_part_json (const void *ctx, sprinter_t *sp, mime_node_t *node,
\r
108 +format_part_json (const void *ctx, struct sprinter *sp, mime_node_t *node,
\r
109 notmuch_bool_t first, notmuch_bool_t output_body);
\r
112 -format_headers_json (sprinter_t *sp, GMimeMessage *message,
\r
113 +format_headers_json (struct sprinter *sp, GMimeMessage *message,
\r
114 notmuch_bool_t reply);
\r