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

mailinfo: move check for metainfo_charset to convert_to_utf8()

Browse Source 
All callers of this function refrain 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 <gitster@pobox.com>
This commit is contained in:
Junio C Hamano 2015-10-18 15:58:35 -07:00
parent 28be2d083c
commit 28c6bfe94c
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
builtin/mailinfo.c
View File

@ -384,7 +384,7 @@ static void convert_to_utf8(struct mailinfo *mi,
{ {
char *out; char *out;
if (!charset || !*charset) if (!mi->metainfo_charset || !charset || !*charset)
return; return;
if (same_encoding(mi->metainfo_charset, charset)) if (same_encoding(mi->metainfo_charset, charset))
@ -459,7 +459,6 @@ static void decode_header(struct mailinfo *mi, struct strbuf *it)
dec = decode_q_segment(&piecebuf, 1); dec = decode_q_segment(&piecebuf, 1);
break; 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_addbuf(&outbuf, dec);
@ -674,7 +673,6 @@ static int handle_commit_msg(struct mailinfo *mi, struct strbuf *line)
mi->header_stage = 0; mi->header_stage = 0;
/* normalize the log message to UTF-8. */ /* 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)) { if (mi->use_scissors && is_scissors_line(line)) {