d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Sync with userland variant.

Browse Source 
MFC after:	2 weeks
This commit is contained in:
Xin LI 2014-11-17 21:01:35 +00:00
parent 91bd62caf5
commit 4facd36ca0
1 changed files with 3 additions and 5 deletions

8
sys/libkern/strncmp.c

@ -10,7 +10,7 @@
* 2. Redistributions in binary form must reproduce the above copyright * 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the * notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution. * 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 * may be used to endorse or promote products derived from this software
* without specific prior written permission. * without specific prior written permission.
* *
@ -33,9 +33,7 @@ __FBSDID("$FreeBSD$");
#include <sys/libkern.h> #include <sys/libkern.h>
int int
strncmp(s1, s2, n) strncmp(const char *s1, const char *s2, size_t n)
register const char *s1, *s2;
register size_t n;
{ {
if (n == 0) if (n == 0)
@ -44,7 +42,7 @@ strncmp(s1, s2, n)
if (*s1 != *s2++) if (*s1 != *s2++)
return (*(const unsigned char *)s1 - return (*(const unsigned char *)s1 -
*(const unsigned char *)(s2 - 1)); *(const unsigned char *)(s2 - 1));
if (*s1++ == 0) if (*s1++ == '\0')
break; break;
} while (--n != 0); } while (--n != 0);
return (0); return (0);