Libc-1081.1.3.tar.gz

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

diff --git a/string/FreeBSD/strnstr.c b/string/FreeBSD/strnstr.c
index abe2f8d885205037d1125e9d7444e98a90936b15..ca12ba1032850bbce5b64a3013b5707f35a0732a 100644 (file)
--- a/string/FreeBSD/strnstr.c
+++ b/string/FreeBSD/strnstr.c
@@ -14,10 +14,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.


@@ -39,7 +35,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/strnstr.c,v 1.3 2005/02/11 21:07:51 pjd Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/string/strnstr.c,v 1.5 2009/02/03 17:58:20 danger Exp $");

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


@@ -48,10 +44,7 @@ __FBSDID("$FreeBSD: src/lib/libc/string/strnstr.c,v 1.3 2005/02/11 21:07:51 pjd
  * first slen characters of s.
  */
 char *
  * first slen characters of s.
  */
 char *

-strnstr(s, find, slen)
-       const char *s;
-       const char *find;
-       size_t slen;
+strnstr(const char *s, const char *find, size_t slen)

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