From f0e578c69cd91a554179c09dab6989f6eb0e2910 Mon Sep 17 00:00:00 2001 From: René Scharfe Date: Sat, 10 Feb 2024 08:43:01 +0100 Subject: use xstrncmpz() MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Add and apply a semantic patch for calling xstrncmpz() to compare a NUL-terminated string with a buffer of a known length instead of using strncmp() and checking the terminating NUL explicitly. This simplifies callers by reducing code duplication. I had to adjust remote.c manually because Coccinelle inexplicably changed the indent of the else branches. Signed-off-by: René Scharfe Signed-off-by: Junio C Hamano --- object.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'object.c') diff --git a/object.c b/object.c index 2c61e4c862..e6a1c4d905 100644 --- a/object.c +++ b/object.c @@ -47,8 +47,7 @@ int type_from_string_gently(const char *str, ssize_t len, int gentle) len = strlen(str); for (i = 1; i < ARRAY_SIZE(object_type_strings); i++) - if (!strncmp(str, object_type_strings[i], len) && - object_type_strings[i][len] == '\0') + if (!xstrncmpz(object_type_strings[i], str, len)) return i; if (gentle) -- cgit v1.2.3