This one is trivial thanks to previous steps that started passing
the structure throughout the input codepaths.
Signed-off-by: Junio C Hamano <gitster@xxxxxxxxx>
---
builtin/mailinfo.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/builtin/mailinfo.c b/builtin/mailinfo.c
index 5823ae5..8bd76c6 100644
--- a/builtin/mailinfo.c
+++ b/builtin/mailinfo.c
@@ -20,6 +20,7 @@ struct mailinfo {
int keep_subject;
int keep_non_patch_brackets_in_subject;
+ int patch_lines;
int filter_stage; /* still reading log or are we copying patch? */
int header_stage; /* still checking in-body headers? */
};
@@ -30,7 +31,6 @@ static enum {
} transfer_encoding;
static struct strbuf charset = STRBUF_INIT;
-static int patch_lines;
static struct strbuf **p_hdr_data, **s_hdr_data;
static int use_scissors;
@@ -778,10 +778,10 @@ static int handle_commit_msg(struct mailinfo *mi, struct strbuf *line)
return 0;
}
-static void handle_patch(const struct strbuf *line)
+static void handle_patch(struct mailinfo *mi, const struct strbuf *line)
{
fwrite(line->buf, 1, line->len, patchfile);
- patch_lines++;
+ mi->patch_lines++;
}
static void handle_filter(struct mailinfo *mi, struct strbuf *line)
@@ -792,7 +792,7 @@ static void handle_filter(struct mailinfo *mi, struct strbuf *line)
break;
mi->filter_stage++;
case 1:
- handle_patch(line);
+ handle_patch(mi, line);
break;
}
}
@@ -944,7 +944,7 @@ static void handle_info(struct mailinfo *mi)
for (i = 0; header[i]; i++) {
/* only print inbody headers if we output a patch file */
- if (patch_lines && s_hdr_data[i])
+ if (mi->patch_lines && s_hdr_data[i])
hdr = s_hdr_data[i];
else if (p_hdr_data[i])
hdr = p_hdr_data[i];
--
2.6.2-383-g144b2e6
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html