Libc-320.1.3.tar.gz

[apple/libc.git] / include / string.h

diff --git a/include/string.h b/include/string.h
index 7c63b1254d189efb112ce9ccadde32a3e3e57732..12cd29be117b654017903ff35883b47208b742a0 100644 (file)
--- a/include/string.h
+++ b/include/string.h
@@ -3,19 +3,20 @@
  *
  * @APPLE_LICENSE_HEADER_START@
  * 
  *
  * @APPLE_LICENSE_HEADER_START@
  * 

- * The contents of this file constitute Original Code as defined in and
- * are subject to the Apple Public Source License Version 1.1 (the
- * "License").  You may not use this file except in compliance with the
- * License.  Please obtain a copy of the License at
- * http://www.apple.com/publicsource and read it before using this file.
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this
+ * file.

  * 
  * 

- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER

  * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
  * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
  * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
  * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,

- * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
- * License for the specific language governing rights and limitations
- * under the License.
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.

  * 
  * @APPLE_LICENSE_HEADER_END@
  */
  * 
  * @APPLE_LICENSE_HEADER_END@
  */


@@ -70,47 +71,52 @@ typedef     _BSD_SIZE_T_    size_t;
 #include <sys/cdefs.h>
 
 __BEGIN_DECLS
 #include <sys/cdefs.h>
 
 __BEGIN_DECLS

-void   *memchr __P((const void *, int, size_t));
-int     memcmp __P((const void *, const void *, size_t));
-void   *memcpy __P((void *, const void *, size_t));
-void   *memmove __P((void *, const void *, size_t));
-void   *memset __P((void *, int, size_t));
-char   *strcat __P((char *, const char *));
-char   *strchr __P((const char *, int));
-int     strcmp __P((const char *, const char *));
-int     strcoll __P((const char *, const char *));
-char   *strcpy __P((char *, const char *));
-size_t  strcspn __P((const char *, const char *));
-char   *strerror __P((int));
-size_t  strlen __P((const char *));
-char   *strncat __P((char *, const char *, size_t));
-int     strncmp __P((const char *, const char *, size_t));
-char   *strncpy __P((char *, const char *, size_t));
-char   *strpbrk __P((const char *, const char *));
-char   *strrchr __P((const char *, int));
-size_t  strspn __P((const char *, const char *));
-char   *strstr __P((const char *, const char *));
-char   *strtok __P((char *, const char *));
-size_t  strxfrm __P((char *, const char *, size_t));
+void   *memchr(const void *, int, size_t);
+int     memcmp(const void *, const void *, size_t);
+void   *memcpy(void *, const void *, size_t);
+void   *memmove(void *, const void *, size_t);
+void   *memset(void *, int, size_t);
+char   *stpcpy(char *, const char *);
+char   *strcasestr(const char *, const char *);
+char   *strcat(char *, const char *);
+char   *strchr(const char *, int);
+int     strcmp(const char *, const char *);
+int     strcoll(const char *, const char *);
+char   *strcpy(char *, const char *);
+size_t  strcspn(const char *, const char *);
+char   *strerror(int);
+int     strerror_r(int, char *, size_t);
+size_t  strlen(const char *);
+char   *strncat(char *, const char *, size_t);
+int     strncmp(const char *, const char *, size_t);
+char   *strncpy(char *, const char *, size_t);
+char   *strnstr(const char *, const char *, size_t);
+char   *strpbrk(const char *, const char *);
+char   *strrchr(const char *, int);
+size_t  strspn(const char *, const char *);
+char   *strstr(const char *, const char *);
+char   *strtok(char *, const char *);
+size_t  strxfrm(char *, const char *, size_t);

 
 /* Nonstandard routines */
 #ifndef _ANSI_SOURCE
 
 /* Nonstandard routines */
 #ifndef _ANSI_SOURCE

-int     bcmp __P((const void *, const void *, size_t));
-void    bcopy __P((const void *, void *, size_t));
-void    bzero __P((void *, size_t));
-int     ffs __P((int));
-char   *index __P((const char *, int));
-void   *memccpy __P((void *, const void *, int, size_t));
-char   *rindex __P((const char *, int));
-int     strcasecmp __P((const char *, const char *));
-char   *strdup __P((const char *));
-size_t  strlcat __P((char *, const char *, size_t));
-size_t  strlcpy __P((char *, const char *, size_t));
-void    strmode __P((int, char *));
-int     strncasecmp __P((const char *, const char *, size_t));
-char   *strsep __P((char **, const char *));
-char   *strtok_r __P((char *, const char *, char **));
-void    swab __P((const void *, void *, size_t));
+int     bcmp(const void *, const void *, size_t);
+void    bcopy(const void *, void *, size_t);
+void    bzero(void *, size_t);
+int     ffs(int);
+char   *index(const char *, int);
+void   *memccpy(void *, const void *, int, size_t);
+char   *rindex(const char *, int);
+int     strcasecmp(const char *, const char *);
+char   *strdup(const char *);
+size_t  strlcat(char *, const char *, size_t);
+size_t  strlcpy(char *, const char *, size_t);
+void    strmode(int, char *);
+int     strncasecmp(const char *, const char *, size_t);
+char   *strsep(char **, const char *);
+char   *strsignal(int sig);
+char   *strtok_r(char *, const char *, char **);
+void    swab(const void *, void *, size_t);

 #endif 
 __END_DECLS
 
 #endif 
 __END_DECLS