[PATCH 2/3] config: use utf8_bom[] from utf.[ch] in git_parse_source()
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Apr 16, 2015, 17:52 UTC
- Message-ID
- <1429206774-10087-3-git-send-email-gitster@pobox.com>
- In-Reply-To
- <1429206774-10087-1-git-send-email-gitster@pobox.com>
Because the function reads one character at the time, unfortunately we cannot use the easier skip_utf8_bom() helper, but at least we do not have to duplicate the constant string this way.
Signed-off-by: Junio C Hamano <gitster@pobox.com> --- config.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/config.c b/config.c index 752e2e2..9618aa4 100644 --- a/config.c +++ b/config.c @@ -12,6 +12,7 @@ #include "quote.h" #include "hashmap.h" #include "string-list.h" +#include "utf8.h" struct config_source { struct config_source *prev; @@ -412,8 +413,7 @@ static int git_parse_source(config_fn_t fn, void *data) struct strbuf *var = &cf->var; /* U+FEFF Byte Order Mark in UTF8 */ - static const unsigned char *utf8_bom = (unsigned char *) "\xef\xbb\xbf"; - const unsigned char *bomptr = utf8_bom; + const char *bomptr = utf8_bom; for (;;) { int c = get_next_char(); @@ -421,7 +421,7 @@ static int git_parse_source(config_fn_t fn, void *data) /* We are at the file beginning; skip UTF8-encoded BOM * if present. Sane editors won't put this in on their * own, but e.g. Windows Notepad will do it happily. */ - if ((unsigned char) c == *bomptr) { + if (c == (*bomptr & 0377)) { bomptr++; continue; } else {
-- 2.4.0-rc2-171-g98ddf7f