[PATCH v3 19/34] mailinfo: move check for metainfo_charset to convert_to_utf8()
From: Junio C Hamano <hidden>
Date: 2016-06-15 23:06:54
Subsystem:
the rest · Maintainer:
Linus Torvalds
All callers of this function refrains from calling it when mi->metainfo_charset is NULL; move the check to the callee, as it already has a few conditions at its beginning to turn it into a no-op. Signed-off-by: Junio C Hamano <redacted> --- builtin/mailinfo.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/builtin/mailinfo.c b/builtin/mailinfo.c
index 26fd9b1..737d0fc 100644
--- a/builtin/mailinfo.c
+++ b/builtin/mailinfo.c@@ -524,7 +524,7 @@ static void convert_to_utf8(struct mailinfo *mi, { char *out; - if (!charset || !*charset) + if (!mi->metainfo_charset || !charset || !*charset) return; if (same_encoding(mi->metainfo_charset, charset))
@@ -599,8 +599,7 @@ static void decode_header(struct mailinfo *mi, struct strbuf *it) dec = decode_q_segment(&piecebuf, 1); break; } - if (mi->metainfo_charset) - convert_to_utf8(mi, dec, charset_q.buf); + convert_to_utf8(mi, dec, charset_q.buf); strbuf_addbuf(&outbuf, dec); strbuf_release(dec);
@@ -745,8 +744,7 @@ static int handle_commit_msg(struct mailinfo *mi, struct strbuf *line) mi->header_stage = 0; /* normalize the log message to UTF-8. */ - if (mi->metainfo_charset) - convert_to_utf8(mi, line, charset.buf); + convert_to_utf8(mi, line, charset.buf); if (mi->use_scissors && is_scissors_line(line)) { int i;
--
2.6.2-383-g144b2e6