diff options
| author | Junio C Hamano <junkio@cox.net> | 2007-02-20 01:54:00 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-02-20 22:03:15 -0800 |
| commit | 599065a3bb94ae9f48e3808b8fafc8443017af28 (patch) | |
| tree | 077a948312df0b4a1c969d251fb5fc69124bbe30 /builtin-rerere.c | |
| parent | cc44c7655fe2dd0cfb46e841156634fe622df397 (diff) | |
| download | git-599065a3bb94ae9f48e3808b8fafc8443017af28.tar.gz git-599065a3bb94ae9f48e3808b8fafc8443017af28.tar.xz | |
prefixcmp(): fix-up mechanical conversion.
Previous step converted use of strncmp() with literal string
mechanically even when the result is only used as a boolean:
if (!strncmp("foo", arg, 3)) ==> if (!(-prefixcmp(arg, "foo")))
This step manually cleans them up to read:
if (!prefixcmp(arg, "foo"))
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'builtin-rerere.c')
| -rw-r--r-- | builtin-rerere.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/builtin-rerere.c b/builtin-rerere.c index 978105b49..dd1d4c1c1 100644 --- a/builtin-rerere.c +++ b/builtin-rerere.c @@ -105,11 +105,11 @@ static int handle_file(const char *path, SHA1_Init(&ctx); while (fgets(buf, sizeof(buf), f)) { - if (!(-prefixcmp(buf, "<<<<<<< "))) + if (!prefixcmp(buf, "<<<<<<< ")) hunk = 1; - else if (!(-prefixcmp(buf, "======="))) + else if (!prefixcmp(buf, "=======")) hunk = 2; - else if (!(-prefixcmp(buf, ">>>>>>> "))) { + else if (!prefixcmp(buf, ">>>>>>> ")) { hunk_no++; hunk = 0; if (memcmp(one->ptr, two->ptr, one->nr < two->nr ? |