diff options
| author | René Scharfe <l.s.r@web.de> | 2024-02-10 08:43:01 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2024-02-12 09:32:41 -0800 |
| commit | f0e578c69cd91a554179c09dab6989f6eb0e2910 (patch) | |
| tree | 0f0e026d645a86529a80a2237f78329534cd5ba1 /merge-ll.c | |
| parent | 3526e67d917bcd03f317a058208fa02737654637 (diff) | |
use xstrncmpz()
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 <l.s.r@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'merge-ll.c')
| -rw-r--r-- | merge-ll.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/merge-ll.c b/merge-ll.c index 1df58ebaac..31f4d031de 100644 --- a/merge-ll.c +++ b/merge-ll.c @@ -286,7 +286,7 @@ static int read_merge_config(const char *var, const char *value, * after seeing merge.<name>.var1. */ for (fn = ll_user_merge; fn; fn = fn->next) - if (!strncmp(fn->name, name, namelen) && !fn->name[namelen]) + if (!xstrncmpz(fn->name, name, namelen)) break; if (!fn) { CALLOC_ARRAY(fn, 1); |