Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
apply: get rid of useless x < 0 comparison on a size_t type
author
Ævar Arnfjörð Bjarmason
<avarab@gmail.com>
Sun, 6 Nov 2011 12:06:22 +0000
(13:06 +0100)
committer
Junio C Hamano
<gitster@pobox.com>
Sun, 6 Nov 2011 18:36:59 +0000
(10:36 -0800)
According to the C standard size_t is always unsigned, therefore the
comparison "n1 < 0 || n2 < 0" when n1 and n2 are size_t will always be
false.
This was raised by clang 2.9 which throws this warning when compiling
apply.c:
builtin/apply.c:253:9: warning: comparison of unsigned expression < 0 is always false [-Wtautological-compare]
if (n1 < 0 || n2 < 0)
~~ ^ ~
builtin/apply.c:253:19: warning: comparison of unsigned expression < 0 is always false [-Wtautological-compare]
if (n1 < 0 || n2 < 0)
~~ ^ ~
This check was originally added in v1.6.5-rc0~53^2 by Giuseppe Bilotta
while adding an option to git-apply to ignore whitespace differences.
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
builtin/apply.c
patch
|
blob
|
history
raw
|
patch
| inline |
side by side
(parent:
703f05a
)
diff --git
a/builtin/apply.c
b/builtin/apply.c
index f2edc52818e817e83717f992a6bbd66dad4ef24d..d600ac63abb44be0580addd855f636a05701b9a2 100644
(file)
--- a/
builtin/apply.c
+++ b/
builtin/apply.c
@@
-250,9
+250,6
@@
static int fuzzy_matchlines(const char *s1, size_t n1,
const char *last2 = s2 + n2 - 1;
int result = 0;
- if (n1 < 0 || n2 < 0)
- return 0;
-
/* ignore line endings */
while ((*last1 == '\r') || (*last1 == '\n'))
last1--;