[PATCH 16/26] mailinfo: move transfer_encoding to struct mailinfo

[Junio C Hamano]

Signed-off-by: Junio C Hamano <gits...@pobox.com>
---
 builtin/mailinfo.c | 27 ++++++++++++++-------------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/builtin/mailinfo.c b/builtin/mailinfo.c
index 7e01efa..fbfa27e 100644
--- a/builtin/mailinfo.c
+++ b/builtin/mailinfo.c
@@ -23,14 +23,14 @@ struct mailinfo {
        const char *metainfo_charset;
 
        char *message_id;
+       enum  {
+               TE_DONTCARE, TE_QP, TE_BASE64
+       } transfer_encoding;
        int patch_lines;
        int filter_stage; /* still reading log or are we copying patch? */
        int header_stage; /* still checking in-body headers? */
 };
 
-static enum  {
-       TE_DONTCARE, TE_QP, TE_BASE64
-} transfer_encoding;
 
 static struct strbuf charset = STRBUF_INIT;
 
@@ -214,14 +214,15 @@ static void handle_message_id(struct mailinfo *mi, const 
struct strbuf *line)
                mi->message_id = strdup(line->buf);
 }
 
-static void handle_content_transfer_encoding(const struct strbuf *line)
+static void handle_content_transfer_encoding(struct mailinfo *mi,
+                                            const struct strbuf *line)
 {
        if (strcasestr(line->buf, "base64"))
-               transfer_encoding = TE_BASE64;
+               mi->transfer_encoding = TE_BASE64;
        else if (strcasestr(line->buf, "quoted-printable"))
-               transfer_encoding = TE_QP;
+               mi->transfer_encoding = TE_QP;
        else
-               transfer_encoding = TE_DONTCARE;
+               mi->transfer_encoding = TE_DONTCARE;
 }
 
 static int is_multipart_boundary(const struct strbuf *line)
@@ -356,7 +357,7 @@ static int check_header(struct mailinfo *mi,
                len = strlen("Content-Transfer-Encoding: ");
                strbuf_add(&sb, line->buf + len, line->len - len);
                decode_header(mi, &sb);
-               handle_content_transfer_encoding(&sb);
+               handle_content_transfer_encoding(mi, &sb);
                ret = 1;
                goto check_header_out;
        }
@@ -615,11 +616,11 @@ release_return:
        strbuf_release(&piecebuf);
 }
 
-static void decode_transfer_encoding(struct strbuf *line)
+static void decode_transfer_encoding(struct mailinfo *mi, struct strbuf *line)
 {
        struct strbuf *ret;
 
-       switch (transfer_encoding) {
+       switch (mi->transfer_encoding) {
        case TE_QP:
                ret = decode_q_segment(line, 0);
                break;
@@ -867,7 +868,7 @@ again:
        }
 
        /* set some defaults */
-       transfer_encoding = TE_DONTCARE;
+       mi->transfer_encoding = TE_DONTCARE;
        strbuf_reset(&charset);
 
        /* slurp in this section's info */
@@ -905,9 +906,9 @@ static void handle_body(struct mailinfo *mi, struct strbuf 
*line)
                }
 
                /* Unwrap transfer encoding */
-               decode_transfer_encoding(line);
+               decode_transfer_encoding(mi, line);
 
-               switch (transfer_encoding) {
+               switch (mi->transfer_encoding) {
                case TE_BASE64:
                case TE_QP:
                {
-- 
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