From f96a33a8ab3a68aab467715f8bf7b35c3559aa93 Mon Sep 17 00:00:00 2001 From: delphij Date: Thu, 4 Dec 2014 23:21:42 +0000 Subject: MFC r274636: Sync with userland variant. --- sys/libkern/strncmp.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/sys/libkern/strncmp.c b/sys/libkern/strncmp.c index 5758d24..268ffbe 100644 --- a/sys/libkern/strncmp.c +++ b/sys/libkern/strncmp.c @@ -10,7 +10,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -33,9 +33,7 @@ __FBSDID("$FreeBSD$"); #include int -strncmp(s1, s2, n) - register const char *s1, *s2; - register size_t n; +strncmp(const char *s1, const char *s2, size_t n) { if (n == 0) @@ -44,7 +42,7 @@ strncmp(s1, s2, n) if (*s1 != *s2++) return (*(const unsigned char *)s1 - *(const unsigned char *)(s2 - 1)); - if (*s1++ == 0) + if (*s1++ == '\0') break; } while (--n != 0); return (0); -- cgit v1.1