undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mailinfo: move patch_lines to struct mailinfo

Browse Source 
This one is trivial thanks to previous steps that started passing
the structure throughout the input codepaths.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Junio C Hamano 2015-10-14 16:13:51 -07:00
parent 13c6df2642
commit 43550efa71
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
builtin/mailinfo.c
View File

@ -20,6 +20,7 @@ struct mailinfo {
int keep_subject; int keep_subject;
int keep_non_patch_brackets_in_subject; int keep_non_patch_brackets_in_subject;
int patch_lines;
int filter_stage; /* still reading log or are we copying patch? */ int filter_stage; /* still reading log or are we copying patch? */
int header_stage; /* still checking in-body headers? */ int header_stage; /* still checking in-body headers? */
}; };
@ -30,7 +31,6 @@ static enum {
} transfer_encoding; } transfer_encoding;
static struct strbuf charset = STRBUF_INIT; static struct strbuf charset = STRBUF_INIT;
static int patch_lines;
static struct strbuf **p_hdr_data, **s_hdr_data; static struct strbuf **p_hdr_data, **s_hdr_data;
static int use_scissors; static int use_scissors;
static int add_message_id; static int add_message_id;
@ -707,10 +707,10 @@ static int handle_commit_msg(struct mailinfo *mi, struct strbuf *line)
return 0; 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); fwrite(line->buf, 1, line->len, patchfile);
patch_lines++; mi->patch_lines++;
} }
static void handle_filter(struct mailinfo *mi, struct strbuf *line) static void handle_filter(struct mailinfo *mi, struct strbuf *line)
@ -721,7 +721,7 @@ static void handle_filter(struct mailinfo *mi, struct strbuf *line)
break; break;
mi->filter_stage++; mi->filter_stage++;
case 1: case 1:
handle_patch(line); handle_patch(mi, line);
break; break;
} }
} }
@ -941,7 +941,7 @@ static void handle_info(struct mailinfo *mi)
for (i = 0; header[i]; i++) { for (i = 0; header[i]; i++) {
/* only print inbody headers if we output a patch file */ /* 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]; hdr = s_hdr_data[i];
else if (p_hdr_data[i]) else if (p_hdr_data[i])
hdr = p_hdr_data[i]; hdr = p_hdr_data[i];