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 18:32:41 +0100 |
| commit | f0e578c69cd91a554179c09dab6989f6eb0e2910 (patch) | |
| tree | 0f0e026d645a86529a80a2237f78329534cd5ba1 /builtin/merge.c | |
| parent | Git 2.43.1 (diff) | |
| download | git-f0e578c69cd91a554179c09dab6989f6eb0e2910.tar.xz git-f0e578c69cd91a554179c09dab6989f6eb0e2910.zip | |
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 'builtin/merge.c')
| -rw-r--r-- | builtin/merge.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/builtin/merge.c b/builtin/merge.c index ebbe05033e..b390a8f6bc 100644 --- a/builtin/merge.c +++ b/builtin/merge.c @@ -192,8 +192,7 @@ static struct strategy *get_strategy(const char *name) int j, found = 0; struct cmdname *ent = main_cmds.names[i]; for (j = 0; !found && j < ARRAY_SIZE(all_strategy); j++) - if (!strncmp(ent->name, all_strategy[j].name, ent->len) - && !all_strategy[j].name[ent->len]) + if (!xstrncmpz(all_strategy[j].name, ent->name, ent->len)) found = 1; if (!found) add_cmdname(¬_strategies, ent->name, ent->len); |