Author: delphij
Date: Mon Nov 17 21:01:35 2014
New Revision: 274636
URL: https://svnweb.freebsd.org/changeset/base/274636
Log:
Sync with userland variant.
MFC after: 2 weeks
Modified:
head/sys/libkern/strncmp.c
Modified: head/sys/libkern/strncmp.c
==============================================================================
--- head/sys/libkern/strncmp.c Mon Nov 17 20:25:21 2014 (r274635)
+++ head/sys/libkern/strncmp.c Mon Nov 17 21:01:35 2014 (r274636)
@@ -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 <sys/libkern.h>
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);
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
