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

diff --git a/4d/b390b0edfc35fc9c546f195c0572b0c2a87a51 b/4d/b390b0edfc35fc9c546f195c0572b0c2a87a51
new file mode 100644 (file)
index 0000000..afda568
--- /dev/null
+++ b/4d/b390b0edfc35fc9c546f195c0572b0c2a87a51
@@ -0,0 +1,106 @@
+Return-Path: <tomi.ollila@iki.fi>\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 C5A7A431E62\r
+       for <notmuch@notmuchmail.org>; Fri,  3 Aug 2012 02:35:26 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: 0\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none]\r
+       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 buHikfsnnLRs for <notmuch@notmuchmail.org>;\r
+       Fri,  3 Aug 2012 02:35:25 -0700 (PDT)\r
+Received: from guru.guru-group.fi (guru.guru-group.fi [46.183.73.34])\r
+       by olra.theworths.org (Postfix) with ESMTP id AA2D0431FAE\r
+       for <notmuch@notmuchmail.org>; Fri,  3 Aug 2012 02:35:25 -0700 (PDT)\r
+Received: by guru.guru-group.fi (Postfix, from userid 501)\r
+       id 29137100372; Fri,  3 Aug 2012 12:35:29 +0300 (EEST)\r
+From: Tomi Ollila <tomi.ollila@iki.fi>\r
+To: Austin Clements <amdragon@MIT.EDU>, notmuch@notmuchmail.org\r
+Subject: Re: [PATCH v3 00/13] Convert notmuch show to use structure printers\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
+User-Agent: Notmuch/0.13.2+123~gc7b631e (http://notmuchmail.org) Emacs/23.1.1\r
+       (x86_64-redhat-linux-gnu)\r
+X-Face: HhBM'cA~<r"^Xv\KRN0P{vn'Y"Kd;zg_y3S[4)KSN~s?O\"QPoL\r
+       $[Xv_BD:i/F$WiEWax}R(MPS`^UaptOGD`*/=@\1lKoVa9tnrg0TW?"r7aRtgk[F\r
+       !)g;OY^,BjTbr)Np:%c_o'jj,Z\r
+Date: Fri, 03 Aug 2012 12:35:29 +0300\r
+Message-ID: <m2zk6c48ta.fsf@guru.guru-group.fi>\r
+MIME-Version: 1.0\r
+Content-Type: text/plain; charset=us-ascii\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 09:35:26 -0000\r
+\r
+On Fri, Aug 03 2012, Austin Clements <amdragon@MIT.EDU> wrote:\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
+LGTM.\r
+\r
+Tomi\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
+> _______________________________________________\r
+> notmuch mailing list\r
+> notmuch@notmuchmail.org\r
+> http://notmuchmail.org/mailman/listinfo/notmuch\r