mailinfo: move check for metainfo_charset to convert_to_utf8()
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:
parent
28be2d083c
commit
28c6bfe94c
@ -384,7 +384,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))
|
||||
@ -459,8 +459,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);
|
||||
@ -674,8 +673,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;
|
||||
|
Loading…
Reference in New Issue
Block a user