Libc-1082.50.1.tar.gz

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

diff --git a/string/FreeBSD/strstr.c b/string/FreeBSD/strstr.c
index f51d17024e03f7cde8548a87f8be335b2f67e9cb..030db2b1c0309e5f37e7acd7640b0727fd34a94a 100644 (file)
--- a/string/FreeBSD/strstr.c
+++ b/string/FreeBSD/strstr.c
@@ -13,10 +13,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.
  * 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.
  * 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.


@@ -38,7 +34,7 @@
 static char sccsid[] = "@(#)strstr.c   8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
 static char sccsid[] = "@(#)strstr.c   8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>

-__FBSDID("$FreeBSD: src/lib/libc/string/strstr.c,v 1.4 2002/03/21 18:44:54 obrien Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/string/strstr.c,v 1.6 2009/02/03 17:58:20 danger Exp $");

 
 #include <string.h>
 
 
 #include <string.h>
 


@@ -46,17 +42,16 @@ __FBSDID("$FreeBSD: src/lib/libc/string/strstr.c,v 1.4 2002/03/21 18:44:54 obrie
  * Find the first occurrence of find in s.
  */
 char *
  * Find the first occurrence of find in s.
  */
 char *

-strstr(s, find)
-       const char *s, *find;
+strstr(const char *s, const char *find)

 {
        char c, sc;
        size_t len;
 
 {
        char c, sc;
        size_t len;
 

-       if ((c = *find++) != 0) {
+       if ((c = *find++) != '\0') {

                len = strlen(find);
                do {
                        do {
                len = strlen(find);
                do {
                        do {

-                               if ((sc = *s++) == 0)
+                               if ((sc = *s++) == '\0')

                                        return (NULL);
                        } while (sc != c);
                } while (strncmp(s, find, len) != 0);
                                        return (NULL);
                        } while (sc != c);
                } while (strncmp(s, find, len) != 0);