BSD 4_3_Net_2 release

[unix-history] / usr / src / include / string.h

diff --git a/usr/src/include/string.h b/usr/src/include/string.h
index a54669b..f27ac2c 100644 (file)
--- a/usr/src/include/string.h
+++ b/usr/src/include/string.h
@@ -2,26 +2,40 @@
  * Copyright (c) 1990 The Regents of the University of California.
  * All rights reserved.
  *
  * Copyright (c) 1990 The Regents of the University of California.
  * All rights reserved.
  *

- * Redistribution and use in source and binary forms are permitted provided
- * that: (1) source distributions retain this entire copyright notice and
- * comment, and (2) distributions including binaries display the following
- * acknowledgement:  ``This product includes software developed by the
- * University of California, Berkeley and its contributors'' in the
- * documentation or other materials provided with the distribution and in
- * all advertising materials mentioning features or use of this software.
- * 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.
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED
- * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 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.

  *
  *

- *     @(#)string.h    5.4 (Berkeley) 5/29/90
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ *     @(#)string.h    5.10 (Berkeley) 3/9/91

  */
 
 #ifndef _STRING_H_
 #define        _STRING_H_
  */
 
 #ifndef _STRING_H_
 #define        _STRING_H_

-#include <machine/machtypes.h>
+#include <machine/ansi.h>

 
 #ifdef _SIZE_T_
 typedef        _SIZE_T_        size_t;
 
 #ifdef _SIZE_T_
 typedef        _SIZE_T_        size_t;


@@ -32,92 +46,48 @@ typedef     _SIZE_T_        size_t;
 #define        NULL    0
 #endif
 
 #define        NULL    0
 #endif
 

-#if __STDC__ || c_plusplus
-
-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   *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);
-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   *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);
-
-#else
+#include <sys/cdefs.h>

 
 

-void   *memchr();
-int     memcmp();
-void   *memcpy();
-void   *memmove();
-void   *memset();
-char   *strcat();
-char   *strchr();
-int     strcmp();
-int     strcoll();
-char   *strcpy();
-size_t  strcspn();
-char   *strerror();
-size_t  strlen();
-char   *strncat();
-int     strncmp();
-char   *strncpy();
-char   *strpbrk();
-char   *strrchr();
-size_t  strspn();
-char   *strstr();
-char   *strtok();
-size_t  strxfrm();
-
-#endif
+__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));

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

-#if __STDC__ || c_plusplus
-
-int     bcmp(const char *, const char *, size_t);
-void    bcopy(const char *, char *, size_t);
-void    bzero(char *, 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 *);
-void    strmode(mode_t, char *);
-int     strncasecmp(const char *, const char *, size_t);
-char   *strsep(char *, const char *);
-void    swab(const char *, char *, size_t);
-
-#else
-
-int     bcmp();
-void    bcopy();
-void    bzero();
-int     ffs();
-char   *index();
-void   *memccpy();
-char   *rindex();
-int     strcasecmp();
-char   *strdup();
-void   strmode();
-int     strncasecmp();
-char   *strsep();
-void    swab();
-
-#endif
+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 *));
+void    strmode __P((int, char *));
+int     strncasecmp __P((const char *, const char *, size_t));
+char   *strsep __P((char **, const char *));
+void    swab __P((const void *, void *, size_t));

 #endif 
 #endif 

+__END_DECLS
+

 #endif /* _STRING_H_ */
 #endif /* _STRING_H_ */