admin/git
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
Phillip Wood
2025-07-16 10:38:29 +01:00
committed by Junio C Hamano
parent bfa405ea36
commit f3ba426e35
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
git-compat-util.h
View File

@@ -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 * is done via tolower(), so it is strictly ASCII (no multi-byte characters or
* locale-specific conversions). * 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) const char **out)
{ {
do { do {
if (!*prefix) { if (!*prefix) {
*out = str; *out = str;
return 1; return true;
} }
} while (tolower(*str++) == tolower(*prefix++)); } 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 * comparison is done via tolower(), so it is strictly ASCII (no multi-byte
* characters or locale-specific conversions). * 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 *prefix,
const char **out, size_t *outlen) const char **out, size_t *outlen)
{ {
@@ -920,10 +920,10 @@ static inline int skip_iprefix_mem(const char *buf, size_t len,
if (!*prefix) { if (!*prefix) {
*out = buf; *out = buf;
*outlen = len; *outlen = len;
return 1; return true;
} }
} while (len-- > 0 && tolower(*buf++) == tolower(*prefix++)); } while (len-- > 0 && tolower(*buf++) == tolower(*prefix++));
return 0; return false;
} }
static inline int strtoul_ui(char const *s, int base, unsigned int *result) static inline int strtoul_ui(char const *s, int base, unsigned int *result)