diff options
| author | eadler <eadler@FreeBSD.org> | 2011-12-02 15:41:09 +0000 |
|---|---|---|
| committer | eadler <eadler@FreeBSD.org> | 2011-12-02 15:41:09 +0000 |
| commit | bdf8a555586d799896e0aff9adf1ed4749ab120a (patch) | |
| tree | 79db9bd23938fe17ea1235cae91996780fe749aa /lib/libc/string/strncmp.c | |
| parent | e5b89f2d70c0092ae178473393348aa3de7e2745 (diff) | |
| download | FreeBSD-src-bdf8a555586d799896e0aff9adf1ed4749ab120a.zip FreeBSD-src-bdf8a555586d799896e0aff9adf1ed4749ab120a.tar.gz | |
Revert r227812 and r227808 per discussion
Reviewed by: many
Approved by: des
Diffstat (limited to 'lib/libc/string/strncmp.c')
| -rw-r--r-- | lib/libc/string/strncmp.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/lib/libc/string/strncmp.c b/lib/libc/string/strncmp.c index 8da2c43..5bc3d5e 100644 --- a/lib/libc/string/strncmp.c +++ b/lib/libc/string/strncmp.c @@ -39,10 +39,8 @@ int strncmp(const char *s1, const char *s2, size_t n) { - /* use a bitwise or to avoid an additional branch instruction */ - if ((n == 0) | (s1 == s2)) + if (n == 0) return (0); - do { if (*s1 != *s2++) return (*(const unsigned char *)s1 - |
