Libc-825.24.tar.gz

[apple/libc.git] / string / FreeBSD / strncmp.c

diff --git a/string/FreeBSD/strncmp.c b/string/FreeBSD/strncmp.c
index 6b0cfc88b9edb3f3b6698f9592423a225e93bb8b..33c412b9609502e5f80f3cdb0babb6662f2599b4 100644 (file)
--- a/string/FreeBSD/strncmp.c
+++ b/string/FreeBSD/strncmp.c
@@ -10,10 +10,6 @@
  * 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.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *     This product includes software developed by the University of
- *     California, Berkeley and its contributors.
  * 4. 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.
@@ -35,14 +31,12 @@
 static char sccsid[] = "@(#)strncmp.c  8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/string/strncmp.c,v 1.5 2002/03/21 18:44:54 obrien Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/string/strncmp.c,v 1.7 2009/02/03 17:58:20 danger Exp $");
 
 #include <string.h>
 
 int
-strncmp(s1, s2, n)
-       const char *s1, *s2;
-       size_t n;
+strncmp(const char *s1, const char *s2, size_t n)
 {
 
        if (n == 0)
@@ -51,7 +45,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);