From: René Scharfe <l.s.r@web.de>
Date: Fri, 8 Nov 2019 20:25:21 +0000 (+0100)
Subject: utf8: use skip_iprefix() in same_utf_encoding()
X-Git-Tag: v2.25.0-rc0~110^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=89f8cabaf35f8a5f7e893f190764597ad5c44ef9;p=thirdparty%2Fgit.git

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>
---

diff --git a/utf8.c b/utf8.c
index 5c8f151f75..5b39361ada 100644
--- a/utf8.c
+++ b/utf8.c
@@ -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;
 }