From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
Date: Fri, 14 Jul 2017 13:05:06 +0000 (+0200)
Subject: remove boolean "first" argument from format_part_sprinter
X-Git-Tag: 0.26_rc0~201
X-Git-Url: https://git.cworth.org/git?p=notmuch;a=commitdiff_plain;h=23eed88e32551d9e0cb9a86eae0a562a049a58af

remove boolean "first" argument from format_part_sprinter

This argument seems to be unused, and format_part_sprinter isn't
required to meet any specific API so it seems cleaner and simpler to
drop it.
---

diff --git a/notmuch-client.h b/notmuch-client.h
index 1d3c0829..9d0f367d 100644
--- a/notmuch-client.h
+++ b/notmuch-client.h
@@ -247,7 +247,7 @@ show_one_part (const char *filename, int part);
 
 void
 format_part_sprinter (const void *ctx, struct sprinter *sp, mime_node_t *node,
-		      notmuch_bool_t first, notmuch_bool_t output_body,
+		      notmuch_bool_t output_body,
 		      notmuch_bool_t include_html);
 
 void
diff --git a/notmuch-reply.c b/notmuch-reply.c
index 40201b80..929f3077 100644
--- a/notmuch-reply.c
+++ b/notmuch-reply.c
@@ -667,7 +667,7 @@ static int do_reply(notmuch_config_t *config,
 
 	    /* Start the original */
 	    sp->map_key (sp, "original");
-	    format_part_sprinter (config, sp, node, TRUE, TRUE, FALSE);
+	    format_part_sprinter (config, sp, node, TRUE, FALSE);
 
 	    /* End */
 	    sp->end (sp);
diff --git a/notmuch-show.c b/notmuch-show.c
index 74e77249..cdcc2a98 100644
--- a/notmuch-show.c
+++ b/notmuch-show.c
@@ -603,7 +603,7 @@ format_omitted_part_meta_sprinter (sprinter_t *sp, GMimeObject *meta, GMimePart
 
 void
 format_part_sprinter (const void *ctx, sprinter_t *sp, mime_node_t *node,
-		      notmuch_bool_t first, notmuch_bool_t output_body,
+		      notmuch_bool_t output_body,
 		      notmuch_bool_t include_html)
 {
     /* Any changes to the JSON or S-Expression format should be
@@ -619,7 +619,7 @@ format_part_sprinter (const void *ctx, sprinter_t *sp, mime_node_t *node,
 	if (output_body) {
 	    sp->map_key (sp, "body");
 	    sp->begin_list (sp);
-	    format_part_sprinter (ctx, sp, mime_node_child (node, 0), first, TRUE, include_html);
+	    format_part_sprinter (ctx, sp, mime_node_child (node, 0), TRUE, include_html);
 	    sp->end (sp);
 	}
 	sp->end (sp);
@@ -721,7 +721,7 @@ format_part_sprinter (const void *ctx, sprinter_t *sp, mime_node_t *node,
     }
 
     for (i = 0; i < node->nchildren; i++)
-	format_part_sprinter (ctx, sp, mime_node_child (node, i), i == 0, TRUE, include_html);
+	format_part_sprinter (ctx, sp, mime_node_child (node, i), TRUE, include_html);
 
     /* Close content structures */
     for (i = 0; i < nclose; i++)
@@ -735,7 +735,7 @@ format_part_sprinter_entry (const void *ctx, sprinter_t *sp,
 			    mime_node_t *node, unused (int indent),
 			    const notmuch_show_params_t *params)
 {
-    format_part_sprinter (ctx, sp, node, TRUE, params->output_body, params->include_html);
+    format_part_sprinter (ctx, sp, node, params->output_body, params->include_html);
 
     return NOTMUCH_STATUS_SUCCESS;
 }