From: Phillip Wood <phillip.wood@dunelm.org.uk>
Date: Wed, 16 Jul 2025 09:38:29 +0000 (+0100)
Subject: git-compat-util: convert string predicates to return bool
X-Git-Tag: v2.51.0-rc0~41^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f3ba426e3539b2d585944f9d6425dbc13b7d0d28;p=thirdparty%2Fgit.git

git-compat-util: convert string predicates to return bool

Since 8277dbe987 (git-compat-util: convert skip_{prefix,suffix}{,_mem}
to bool, 2023-12-16) a number of our string predicates have been
returning bool instead of int. Now that we've declared that experiment
a success, let's convert the return type of the case-independent
skip_iprefix() and skip_iprefix_mem() functions to match the return
type of their case-dependent equivalents. Returning bool instead of
int makes it clear that these functions are predicates.

Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/git-compat-util.h b/git-compat-util.h
index 4678e21c4c..50ca9dc547 100644
--- a/git-compat-util.h
+++ b/git-compat-util.h
@@ -895,16 +895,16 @@ static inline size_t xsize_t(off_t len)
  * is done via tolower(), so it is strictly ASCII (no multi-byte characters or
  * locale-specific conversions).
  */
-static inline int skip_iprefix(const char *str, const char *prefix,
+static inline bool skip_iprefix(const char *str, const char *prefix,
 			       const char **out)
 {
 	do {
 		if (!*prefix) {
 			*out = str;
-			return 1;
+			return true;
 		}
 	} while (tolower(*str++) == tolower(*prefix++));
-	return 0;
+	return false;
 }
 
 /*
@@ -912,7 +912,7 @@ static inline int skip_iprefix(const char *str, const char *prefix,
  * comparison is done via tolower(), so it is strictly ASCII (no multi-byte
  * characters or locale-specific conversions).
  */
-static inline int skip_iprefix_mem(const char *buf, size_t len,
+static inline bool skip_iprefix_mem(const char *buf, size_t len,
 				   const char *prefix,
 				   const char **out, size_t *outlen)
 {
@@ -920,10 +920,10 @@ static inline int skip_iprefix_mem(const char *buf, size_t len,
 		if (!*prefix) {
 			*out = buf;
 			*outlen = len;
-			return 1;
+			return true;
 		}
 	} while (len-- > 0 && tolower(*buf++) == tolower(*prefix++));
-	return 0;
+	return false;
 }
 
 static inline int strtoul_ui(char const *s, int base, unsigned int *result)