diff options
author | René Scharfe <l.s.r@web.de> | 2019-11-08 23:25:21 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2019-11-10 10:04:36 +0300 |
commit | 89f8cabaf35f8a5f7e893f190764597ad5c44ef9 (patch) | |
tree | 88de4e90685eeac328b61f3bcb1c27bb9010d9a3 /utf8.c | |
parent | da72936f544fec5a335e66432610e4cef4430991 (diff) |
utf8: use skip_iprefix() in same_utf_encoding()
Get rid of magic numbers by using skip_iprefix() and skip_prefix() for
parsing the leading "[uU][tT][fF]-?" of both strings instead of checking
with istarts_with() and an explicit comparison.
Signed-off-by: René Scharfe <l.s.r@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'utf8.c')
-rw-r--r-- | utf8.c | 9 |
1 files changed, 4 insertions, 5 deletions
@@ -411,11 +411,10 @@ out: */ static int same_utf_encoding(const char *src, const char *dst) { - if (istarts_with(src, "utf") && istarts_with(dst, "utf")) { - /* src[3] or dst[3] might be '\0' */ - int i = (src[3] == '-' ? 4 : 3); - int j = (dst[3] == '-' ? 4 : 3); - return !strcasecmp(src+i, dst+j); + if (skip_iprefix(src, "utf", &src) && skip_iprefix(dst, "utf", &dst)) { + skip_prefix(src, "-", &src); + skip_prefix(dst, "-", &dst); + return !strcasecmp(src, dst); } return 0; } |