Two helper functions use "static int" in their scope to keep track
of the state while repeatedly getting called once for each input
line. Move these state variables their ultimate caller and pass
down pointers to them, as a small step in preparation for making
this entire callchain more reentrant.
Signed-off-by: Junio C Hamano <gits...@pobox.com>
---
builtin/mailinfo.c | 48 +++++++++++++++++++++++-------------------------
1 file changed, 23 insertions(+), 25 deletions(-)
diff --git a/builtin/mailinfo.c b/builtin/mailinfo.c
index 175c6ae..5a74811 100644
--- a/builtin/mailinfo.c
+++ b/builtin/mailinfo.c
@@ -713,21 +713,20 @@ static int is_scissors_line(const struct strbuf *line)
gap * 2 < perforation);
}
-static int handle_commit_msg(struct strbuf *line)
+static int handle_commit_msg(struct strbuf *line, int *still_looking)
{
/*
* Are we still scanning and discarding in-body headers?
* It is initially set to 1, set to 2 when we do see a
* valid in-body header.
*/
- static int still_looking = 1;
int is_empty_line;
if (!cmitmsg)
return 0;
is_empty_line = (!line->len || (line->len == 1 && line->buf[0] ==
'\n'));
- if (still_looking == 1) {
+ if (*still_looking == 1) {
/*
* Haven't seen a known in-body header; discard an empty line.
*/
@@ -735,33 +734,33 @@ static int handle_commit_msg(struct strbuf *line)
return 0;
}
- if (use_inbody_headers && still_looking) {
+ if (use_inbody_headers && *still_looking) {
int is_known_header = check_header(line, s_hdr_data, 0);
- if (still_looking == 2) {
+ if (*still_looking == 2) {
/*
* an empty line after the in-body header block,
* or a line obviously not an attempt to invent
* an unsupported in-body header.
*/
if (is_empty_line || !is_rfc2822_header(line))
- still_looking = 0;
+ *still_looking = 0;
if (is_empty_line)
return 0;
/* otherwise do not discard the line, but keep going */
} else if (is_known_header) {
- still_looking = 2;
- } else if (still_looking != 2) {
- still_looking = 0;
+ *still_looking = 2;
+ } else if (*still_looking != 2) {
+ *still_looking = 0;
}
- if (still_looking)
+ if (*still_looking)
return 0;
} else
/* Only trim the first (blank) line of the commit message
* when ignoring in-body headers.
*/
- still_looking = 0;
+ *still_looking = 0;
/* normalize the log message to UTF-8. */
if (metainfo_charset)
@@ -773,7 +772,7 @@ static int handle_commit_msg(struct strbuf *line)
die_errno("Could not rewind output message file");
if (ftruncate(fileno(cmitmsg), 0))
die_errno("Could not truncate output message file at
scissors");
- still_looking = 1;
+ *still_looking = 1;
/*
* We may have already read "secondary headers"; purge
@@ -805,16 +804,13 @@ static void handle_patch(const struct strbuf *line)
patch_lines++;
}
-static void handle_filter(struct strbuf *line)
+static void handle_filter(struct strbuf *line, int *filter_stage, int
*header_stage)
{
- static int filter = 0;
-
- /* filter tells us which part we left off on */
- switch (filter) {
+ switch (*filter_stage) {
case 0:
- if (!handle_commit_msg(line))
+ if (!handle_commit_msg(line, header_stage))
break;
- filter++;
+ (*filter_stage)++;
case 1:
handle_patch(line);
break;
@@ -830,7 +826,7 @@ static int find_boundary(void)
return 0;
}
-static int handle_boundary(void)
+static int handle_boundary(int *filter_stage, int *header_stage)
{
struct strbuf newline = STRBUF_INIT;
@@ -852,7 +848,7 @@ again:
"can't recover\n");
exit(1);
}
- handle_filter(&newline);
+ handle_filter(&newline, filter_stage, header_stage);
strbuf_release(&newline);
/* skip to the next boundary */
@@ -880,6 +876,8 @@ again:
static void handle_body(void)
{
struct strbuf prev = STRBUF_INIT;
+ int filter_stage = 0;
+ int header_stage = 1;
/* Skip up to the first boundary */
if (*content_top) {
@@ -892,10 +890,10 @@ static void handle_body(void)
if (*content_top && is_multipart_boundary(&line)) {
/* flush any leftover */
if (prev.len) {
- handle_filter(&prev);
+ handle_filter(&prev, &filter_stage,
&header_stage);
strbuf_reset(&prev);
}
- if (!handle_boundary())
+ if (!handle_boundary(&filter_stage, &header_stage))
goto handle_body_out;
}
@@ -925,7 +923,7 @@ static void handle_body(void)
strbuf_addbuf(&prev, sb);
break;
}
- handle_filter(sb);
+ handle_filter(sb, &filter_stage, &header_stage);
}
/*
* The partial chunk is saved in "prev" and will be
@@ -935,7 +933,7 @@ static void handle_body(void)
break;
}
default:
- handle_filter(&line);
+ handle_filter(&line, &filter_stage, &header_stage);
}
} while (!strbuf_getwholeline(&line, fin, '\n'));
--
2.6.1-320-g86a1181
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
