This function has a single caller, and called with the global "line"
holding the first line of the e-mail body after the caller finished
processing the e-mail headers. The function then goes into a loop
to process each line of the input, starting from what was given by
its caller, and fills the same global "line" variable from the input
as it needs to process more lines.
Let the caller explicitly pass a pointer to this global "line"
variable as an argument, and have the function itself use that
strbuf throughout, instead of referring to the global "line" itself.
There are helper functions that this function calls that still touch
the global directly; they will be updated as the series progresses.
Signed-off-by: Junio C Hamano <gitster@xxxxxxxxx>
---
builtin/mailinfo.c | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/builtin/mailinfo.c b/builtin/mailinfo.c
index 1518708..52be7db 100644
--- a/builtin/mailinfo.c
+++ b/builtin/mailinfo.c
@@ -844,7 +844,7 @@ again:
return 1;
}
-static void handle_body(void)
+static void handle_body(struct strbuf *line)
{
struct strbuf prev = STRBUF_INIT;
int filter_stage = 0;
@@ -858,7 +858,7 @@ static void handle_body(void)
do {
/* process any boundary lines */
- if (*content_top && is_multipart_boundary(&line)) {
+ if (*content_top && is_multipart_boundary(line)) {
/* flush any leftover */
if (prev.len) {
handle_filter(&prev, &filter_stage, &header_stage);
@@ -869,7 +869,7 @@ static void handle_body(void)
}
/* Unwrap transfer encoding */
- decode_transfer_encoding(&line);
+ decode_transfer_encoding(line);
switch (transfer_encoding) {
case TE_BASE64:
@@ -878,7 +878,7 @@ static void handle_body(void)
struct strbuf **lines, **it, *sb;
/* Prepend any previous partial lines */
- strbuf_insert(&line, 0, prev.buf, prev.len);
+ strbuf_insert(line, 0, prev.buf, prev.len);
strbuf_reset(&prev);
/*
@@ -886,7 +886,7 @@ static void handle_body(void)
* multiple new lines. Pass only one chunk
* at a time to handle_filter()
*/
- lines = strbuf_split(&line, '\n');
+ lines = strbuf_split(line, '\n');
for (it = lines; (sb = *it); it++) {
if (*(it + 1) == NULL) /* The last line */
if (sb->buf[sb->len - 1] != '\n') {
@@ -904,10 +904,10 @@ static void handle_body(void)
break;
}
default:
- handle_filter(&line, &filter_stage, &header_stage);
+ handle_filter(line, &filter_stage, &header_stage);
}
- } while (!strbuf_getwholeline(&line, fin, '\n'));
+ } while (!strbuf_getwholeline(line, fin, '\n'));
handle_body_out:
strbuf_release(&prev);
@@ -993,7 +993,7 @@ static int mailinfo(FILE *in, FILE *out, const char *msg, const char *patch)
while (read_one_header_line(&line, fin))
check_header(&line, p_hdr_data, 1);
- handle_body();
+ handle_body(&line);
fclose(patchfile);
handle_info();
--
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