diff options
| author | jtc <jtc@NetBSD.org> | 1995-06-15 00:07:11 +0000 |
|---|---|---|
| committer | jtc <jtc@NetBSD.org> | 1995-06-15 00:07:11 +0000 |
| commit | 752ff8fb6caa0804c7087628a4abd895d105e052 (patch) | |
| tree | e15b0c86c0c55adeac53bfef6def62d016fbf3a8 /lib/libc/string | |
| parent | b5f782e810aa16d949b1c64fae69216d83e26666 (diff) | |
don't include <sys/cdefs.h>, it's a 'private' header
Diffstat (limited to 'lib/libc/string')
| -rw-r--r-- | lib/libc/string/__strsignal.c | 3 | ||||
| -rw-r--r-- | lib/libc/string/bcopy.c | 3 | ||||
| -rw-r--r-- | lib/libc/string/ffs.c | 3 | ||||
| -rw-r--r-- | lib/libc/string/memccpy.c | 3 | ||||
| -rw-r--r-- | lib/libc/string/memchr.c | 3 | ||||
| -rw-r--r-- | lib/libc/string/memcmp.c | 3 | ||||
| -rw-r--r-- | lib/libc/string/memset.c | 3 | ||||
| -rw-r--r-- | lib/libc/string/strcasecmp.c | 7 | ||||
| -rw-r--r-- | lib/libc/string/strcmp.c | 3 | ||||
| -rw-r--r-- | lib/libc/string/strcoll.c | 4 | ||||
| -rw-r--r-- | lib/libc/string/strcpy.c | 3 | ||||
| -rw-r--r-- | lib/libc/string/strcspn.c | 3 | ||||
| -rw-r--r-- | lib/libc/string/strdup.c | 6 | ||||
| -rw-r--r-- | lib/libc/string/strlen.c | 3 | ||||
| -rw-r--r-- | lib/libc/string/strncat.c | 3 | ||||
| -rw-r--r-- | lib/libc/string/strncmp.c | 3 | ||||
| -rw-r--r-- | lib/libc/string/strncpy.c | 3 | ||||
| -rw-r--r-- | lib/libc/string/strpbrk.c | 3 | ||||
| -rw-r--r-- | lib/libc/string/strsep.c | 8 | ||||
| -rw-r--r-- | lib/libc/string/strspn.c | 3 | ||||
| -rw-r--r-- | lib/libc/string/strstr.c | 3 | ||||
| -rw-r--r-- | lib/libc/string/strxfrm.c | 3 |
22 files changed, 31 insertions, 48 deletions
diff --git a/lib/libc/string/__strsignal.c b/lib/libc/string/__strsignal.c index d37252d12e9..d0dc9eaa2b1 100644 --- a/lib/libc/string/__strsignal.c +++ b/lib/libc/string/__strsignal.c @@ -33,7 +33,7 @@ #if defined(LIBC_SCCS) && !defined(lint) /*static char *sccsid = "from: @(#)strerror.c 5.6 (Berkeley) 5/4/91";*/ -static char *rcsid = "$Id: __strsignal.c,v 1.8 1995/04/24 16:37:34 cgd Exp $"; +static char *rcsid = "$Id: __strsignal.c,v 1.9 1995/06/15 00:07:11 jtc Exp $"; #endif /* LIBC_SCCS and not lint */ #ifdef NLS @@ -45,6 +45,7 @@ static char *rcsid = "$Id: __strsignal.c,v 1.8 1995/04/24 16:37:34 cgd Exp $"; #define sys_siglist _sys_siglist +#include <stdio.h> #include <signal.h> #include <string.h> diff --git a/lib/libc/string/bcopy.c b/lib/libc/string/bcopy.c index e1f708b6cf7..1bed705e715 100644 --- a/lib/libc/string/bcopy.c +++ b/lib/libc/string/bcopy.c @@ -36,10 +36,9 @@ #if defined(LIBC_SCCS) && !defined(lint) /*static char *sccsid = "from: @(#)bcopy.c 5.11 (Berkeley) 6/21/91";*/ -static char *rcsid = "$Id: bcopy.c,v 1.4 1994/10/19 03:08:23 cgd Exp $"; +static char *rcsid = "$Id: bcopy.c,v 1.5 1995/06/15 00:07:16 jtc Exp $"; #endif /* LIBC_SCCS and not lint */ -#include <sys/cdefs.h> #include <string.h> /* diff --git a/lib/libc/string/ffs.c b/lib/libc/string/ffs.c index fcdf933500a..752ad4bf6d5 100644 --- a/lib/libc/string/ffs.c +++ b/lib/libc/string/ffs.c @@ -33,7 +33,7 @@ #if defined(LIBC_SCCS) && !defined(lint) /*static char *sccsid = "from: @(#)ffs.c 5.4 (Berkeley) 5/17/90";*/ -static char *rcsid = "$Id: ffs.c,v 1.3 1993/08/26 00:51:38 jtc Exp $"; +static char *rcsid = "$Id: ffs.c,v 1.4 1995/06/15 00:07:20 jtc Exp $"; #endif /* LIBC_SCCS and not lint */ #include <string.h> @@ -41,6 +41,7 @@ static char *rcsid = "$Id: ffs.c,v 1.3 1993/08/26 00:51:38 jtc Exp $"; /* * ffs -- vax ffs instruction */ +int ffs(mask) register int mask; { diff --git a/lib/libc/string/memccpy.c b/lib/libc/string/memccpy.c index a22dc9b274e..0c41a0bcaf0 100644 --- a/lib/libc/string/memccpy.c +++ b/lib/libc/string/memccpy.c @@ -33,10 +33,9 @@ #if defined(LIBC_SCCS) && !defined(lint) /*static char *sccsid = "from: @(#)memccpy.c 5.8 (Berkeley) 5/30/91";*/ -static char *rcsid = "$Id: memccpy.c,v 1.5 1993/08/26 00:51:40 jtc Exp $"; +static char *rcsid = "$Id: memccpy.c,v 1.6 1995/06/15 00:07:23 jtc Exp $"; #endif /* LIBC_SCCS and not lint */ -#include <sys/cdefs.h> #include <string.h> void * diff --git a/lib/libc/string/memchr.c b/lib/libc/string/memchr.c index 60870182ef7..eb0d9d9dfeb 100644 --- a/lib/libc/string/memchr.c +++ b/lib/libc/string/memchr.c @@ -36,10 +36,9 @@ #if defined(LIBC_SCCS) && !defined(lint) /*static char *sccsid = "from: @(#)memchr.c 5.6 (Berkeley) 1/26/91";*/ -static char *rcsid = "$Id: memchr.c,v 1.3 1993/08/26 00:51:41 jtc Exp $"; +static char *rcsid = "$Id: memchr.c,v 1.4 1995/06/15 00:07:27 jtc Exp $"; #endif /* LIBC_SCCS and not lint */ -#include <sys/cdefs.h> #include <string.h> void * diff --git a/lib/libc/string/memcmp.c b/lib/libc/string/memcmp.c index 2fe624a5c87..70095127d63 100644 --- a/lib/libc/string/memcmp.c +++ b/lib/libc/string/memcmp.c @@ -36,10 +36,9 @@ #if defined(LIBC_SCCS) && !defined(lint) /*static char *sccsid = "from: @(#)memcmp.c 5.6 (Berkeley) 1/26/91";*/ -static char *rcsid = "$Id: memcmp.c,v 1.3 1993/08/26 00:51:42 jtc Exp $"; +static char *rcsid = "$Id: memcmp.c,v 1.4 1995/06/15 00:07:32 jtc Exp $"; #endif /* LIBC_SCCS and not lint */ -#include <sys/cdefs.h> #include <string.h> /* diff --git a/lib/libc/string/memset.c b/lib/libc/string/memset.c index 3dbe1bfb9d5..65659f709e4 100644 --- a/lib/libc/string/memset.c +++ b/lib/libc/string/memset.c @@ -36,10 +36,9 @@ #if defined(LIBC_SCCS) && !defined(lint) /*static char *sccsid = "from: @(#)memset.c 5.6 (Berkeley) 1/26/91";*/ -static char *rcsid = "$Id: memset.c,v 1.3 1993/08/26 00:51:43 jtc Exp $"; +static char *rcsid = "$Id: memset.c,v 1.4 1995/06/15 00:07:35 jtc Exp $"; #endif /* LIBC_SCCS and not lint */ -#include <sys/cdefs.h> #include <string.h> void * diff --git a/lib/libc/string/strcasecmp.c b/lib/libc/string/strcasecmp.c index c1ca10fc311..8e828816e9b 100644 --- a/lib/libc/string/strcasecmp.c +++ b/lib/libc/string/strcasecmp.c @@ -31,14 +31,13 @@ * SUCH DAMAGE. */ -#include <sys/cdefs.h> -#include <string.h> - #if defined(LIBC_SCCS) && !defined(lint) /*static const char sccsid[] = "from: @(#)strcasecmp.c 5.10 (Berkeley) 1/26/91";*/ -static char *rcsid = "$Id: strcasecmp.c,v 1.3 1993/08/26 00:51:45 jtc Exp $"; +static char *rcsid = "$Id: strcasecmp.c,v 1.4 1995/06/15 00:07:37 jtc Exp $"; #endif /* LIBC_SCCS and not lint */ +#include <string.h> + typedef unsigned char u_char; /* diff --git a/lib/libc/string/strcmp.c b/lib/libc/string/strcmp.c index 129a23f4338..5c77270532b 100644 --- a/lib/libc/string/strcmp.c +++ b/lib/libc/string/strcmp.c @@ -36,10 +36,9 @@ #if defined(LIBC_SCCS) && !defined(lint) /*static char *sccsid = "from: @(#)strcmp.c 5.5 (Berkeley) 1/26/91";*/ -static char *rcsid = "$Id: strcmp.c,v 1.3 1993/08/26 00:51:47 jtc Exp $"; +static char *rcsid = "$Id: strcmp.c,v 1.4 1995/06/15 00:07:40 jtc Exp $"; #endif /* LIBC_SCCS and not lint */ -#include <sys/cdefs.h> #include <string.h> /* diff --git a/lib/libc/string/strcoll.c b/lib/libc/string/strcoll.c index 3439f2530ac..973013d1b17 100644 --- a/lib/libc/string/strcoll.c +++ b/lib/libc/string/strcoll.c @@ -36,15 +36,15 @@ #if defined(LIBC_SCCS) && !defined(lint) /*static char *sccsid = "from: @(#)strcoll.c 5.2 (Berkeley) 1/26/91";*/ -static char *rcsid = "$Id: strcoll.c,v 1.3 1993/08/26 00:51:48 jtc Exp $"; +static char *rcsid = "$Id: strcoll.c,v 1.4 1995/06/15 00:07:44 jtc Exp $"; #endif /* LIBC_SCCS and not lint */ -#include <sys/cdefs.h> #include <string.h> /* * Compare strings according to LC_COLLATE category of current locale. */ +int strcoll(s1, s2) const char *s1, *s2; { diff --git a/lib/libc/string/strcpy.c b/lib/libc/string/strcpy.c index 22b0fb465ca..921955538d3 100644 --- a/lib/libc/string/strcpy.c +++ b/lib/libc/string/strcpy.c @@ -33,10 +33,9 @@ #if defined(LIBC_SCCS) && !defined(lint) /*static char *sccsid = "from: @(#)strcpy.c 5.7 (Berkeley) 2/24/91";*/ -static char *rcsid = "$Id: strcpy.c,v 1.3 1993/08/26 00:51:49 jtc Exp $"; +static char *rcsid = "$Id: strcpy.c,v 1.4 1995/06/15 00:07:47 jtc Exp $"; #endif /* LIBC_SCCS and not lint */ -#include <sys/cdefs.h> #include <string.h> char * diff --git a/lib/libc/string/strcspn.c b/lib/libc/string/strcspn.c index af8bebc1dcd..ccfe6c72756 100644 --- a/lib/libc/string/strcspn.c +++ b/lib/libc/string/strcspn.c @@ -36,10 +36,9 @@ #if defined(LIBC_SCCS) && !defined(lint) /*static char *sccsid = "from: @(#)strcspn.c 5.6 (Berkeley) 1/26/91";*/ -static char *rcsid = "$Id: strcspn.c,v 1.3 1993/08/26 00:51:50 jtc Exp $"; +static char *rcsid = "$Id: strcspn.c,v 1.4 1995/06/15 00:07:51 jtc Exp $"; #endif /* LIBC_SCCS and not lint */ -#include <sys/cdefs.h> #include <string.h> /* diff --git a/lib/libc/string/strdup.c b/lib/libc/string/strdup.c index 366b5dbe8c1..b75234d80ef 100644 --- a/lib/libc/string/strdup.c +++ b/lib/libc/string/strdup.c @@ -33,7 +33,7 @@ #if defined(LIBC_SCCS) && !defined(lint) /*static char *sccsid = "from: @(#)strdup.c 5.4 (Berkeley) 2/24/91";*/ -static char *rcsid = "$Id: strdup.c,v 1.5 1995/04/14 19:25:13 jtc Exp $"; +static char *rcsid = "$Id: strdup.c,v 1.6 1995/06/15 00:07:53 jtc Exp $"; #endif /* LIBC_SCCS and not lint */ #include <stdlib.h> @@ -43,11 +43,11 @@ char * strdup(str) const char *str; { - int len; + size_t len; char *copy; len = strlen(str) + 1; - if (!(copy = malloc((u_int)len))) + if (!(copy = malloc(len))) return((char *)NULL); memcpy(copy, str, len); return(copy); diff --git a/lib/libc/string/strlen.c b/lib/libc/string/strlen.c index 9e3d524f64f..b244204837a 100644 --- a/lib/libc/string/strlen.c +++ b/lib/libc/string/strlen.c @@ -33,10 +33,9 @@ #if defined(LIBC_SCCS) && !defined(lint) /*static char *sccsid = "from: @(#)strlen.c 5.5 (Berkeley) 1/26/91";*/ -static char *rcsid = "$Id: strlen.c,v 1.3 1993/08/26 00:51:53 jtc Exp $"; +static char *rcsid = "$Id: strlen.c,v 1.4 1995/06/15 00:08:00 jtc Exp $"; #endif /* LIBC_SCCS and not lint */ -#include <sys/cdefs.h> #include <string.h> size_t diff --git a/lib/libc/string/strncat.c b/lib/libc/string/strncat.c index e7d1bb055bb..7e61e828cf6 100644 --- a/lib/libc/string/strncat.c +++ b/lib/libc/string/strncat.c @@ -36,10 +36,9 @@ #if defined(LIBC_SCCS) && !defined(lint) /*static char *sccsid = "from: @(#)strncat.c 5.6 (Berkeley) 1/26/91";*/ -static char *rcsid = "$Id: strncat.c,v 1.3 1993/08/26 00:51:54 jtc Exp $"; +static char *rcsid = "$Id: strncat.c,v 1.4 1995/06/15 00:08:07 jtc Exp $"; #endif /* LIBC_SCCS and not lint */ -#include <sys/cdefs.h> #include <string.h> /* diff --git a/lib/libc/string/strncmp.c b/lib/libc/string/strncmp.c index 3152702b97c..bc32fbc7799 100644 --- a/lib/libc/string/strncmp.c +++ b/lib/libc/string/strncmp.c @@ -33,10 +33,9 @@ #if defined(LIBC_SCCS) && !defined(lint) /*static char *sccsid = "from: @(#)strncmp.c 5.6 (Berkeley) 1/26/91";*/ -static char *rcsid = "$Id: strncmp.c,v 1.3 1993/08/26 00:51:55 jtc Exp $"; +static char *rcsid = "$Id: strncmp.c,v 1.4 1995/06/15 00:08:14 jtc Exp $"; #endif /* LIBC_SCCS and not lint */ -#include <sys/cdefs.h> #include <string.h> int diff --git a/lib/libc/string/strncpy.c b/lib/libc/string/strncpy.c index 6c757c8c7ed..dd2f063c3b2 100644 --- a/lib/libc/string/strncpy.c +++ b/lib/libc/string/strncpy.c @@ -36,10 +36,9 @@ #if defined(LIBC_SCCS) && !defined(lint) /*static char *sccsid = "from: @(#)strncpy.c 5.6 (Berkeley) 1/26/91";*/ -static char *rcsid = "$Id: strncpy.c,v 1.3 1993/08/26 00:51:56 jtc Exp $"; +static char *rcsid = "$Id: strncpy.c,v 1.4 1995/06/15 00:08:20 jtc Exp $"; #endif /* LIBC_SCCS and not lint */ -#include <sys/cdefs.h> #include <string.h> /* diff --git a/lib/libc/string/strpbrk.c b/lib/libc/string/strpbrk.c index 7bdfc3879b2..d1ff318b37a 100644 --- a/lib/libc/string/strpbrk.c +++ b/lib/libc/string/strpbrk.c @@ -33,10 +33,9 @@ #if defined(LIBC_SCCS) && !defined(lint) /*static char *sccsid = "from: @(#)strpbrk.c 5.8 (Berkeley) 1/26/91";*/ -static char *rcsid = "$Id: strpbrk.c,v 1.3 1993/08/26 00:51:57 jtc Exp $"; +static char *rcsid = "$Id: strpbrk.c,v 1.4 1995/06/15 00:08:25 jtc Exp $"; #endif /* LIBC_SCCS and not lint */ -#include <sys/cdefs.h> #include <string.h> /* diff --git a/lib/libc/string/strsep.c b/lib/libc/string/strsep.c index ae3638125f8..9dcf6374fa9 100644 --- a/lib/libc/string/strsep.c +++ b/lib/libc/string/strsep.c @@ -31,15 +31,13 @@ * SUCH DAMAGE. */ -#include <sys/cdefs.h> -#include <string.h> -#include <stdio.h> - #if defined(LIBC_SCCS) && !defined(lint) /*static const char sccsid[] = "from: @(#)strsep.c 5.4 (Berkeley) 1/26/91";*/ -static char *rcsid = "$Id: strsep.c,v 1.3 1993/08/26 00:51:58 jtc Exp $"; +static char *rcsid = "$Id: strsep.c,v 1.4 1995/06/15 00:08:31 jtc Exp $"; #endif /* LIBC_SCCS and not lint */ +#include <string.h> + /* * Get next token from string *stringp, where tokens are nonempty * strings separated by characters from delim. diff --git a/lib/libc/string/strspn.c b/lib/libc/string/strspn.c index 0509ca5bfd2..0b5ef8fff5c 100644 --- a/lib/libc/string/strspn.c +++ b/lib/libc/string/strspn.c @@ -33,10 +33,9 @@ #if defined(LIBC_SCCS) && !defined(lint) /*static char *sccsid = "from: @(#)strspn.c 5.8 (Berkeley) 1/26/91";*/ -static char *rcsid = "$Id: strspn.c,v 1.3 1993/08/26 00:52:00 jtc Exp $"; +static char *rcsid = "$Id: strspn.c,v 1.4 1995/06/15 00:08:37 jtc Exp $"; #endif /* LIBC_SCCS and not lint */ -#include <sys/cdefs.h> #include <string.h> /* diff --git a/lib/libc/string/strstr.c b/lib/libc/string/strstr.c index 232fce6aba9..9e8639949e5 100644 --- a/lib/libc/string/strstr.c +++ b/lib/libc/string/strstr.c @@ -36,10 +36,9 @@ #if defined(LIBC_SCCS) && !defined(lint) /*static char *sccsid = "from: @(#)strstr.c 5.2 (Berkeley) 1/26/91";*/ -static char *rcsid = "$Id: strstr.c,v 1.3 1993/08/26 00:52:01 jtc Exp $"; +static char *rcsid = "$Id: strstr.c,v 1.4 1995/06/15 00:08:43 jtc Exp $"; #endif /* LIBC_SCCS and not lint */ -#include <sys/cdefs.h> #include <string.h> /* diff --git a/lib/libc/string/strxfrm.c b/lib/libc/string/strxfrm.c index 25b2607d047..7054be47456 100644 --- a/lib/libc/string/strxfrm.c +++ b/lib/libc/string/strxfrm.c @@ -36,10 +36,9 @@ #if defined(LIBC_SCCS) && !defined(lint) /*static char *sccsid = "from: @(#)strxfrm.c 5.2 (Berkeley) 1/26/91";*/ -static char *rcsid = "$Id: strxfrm.c,v 1.3 1993/08/26 00:52:02 jtc Exp $"; +static char *rcsid = "$Id: strxfrm.c,v 1.4 1995/06/15 00:08:51 jtc Exp $"; #endif /* LIBC_SCCS and not lint */ -#include <sys/cdefs.h> #include <string.h> /* |
