diff options
| author | David E. O'Brien <obrien@FreeBSD.org> | 2001-11-07 19:55:16 +0000 |
|---|---|---|
| committer | David E. O'Brien <obrien@FreeBSD.org> | 2001-11-07 19:55:16 +0000 |
| commit | de5fe5d53b634e506f94a6df3a9261aa20fa152f (patch) | |
| tree | e47c6230efb2d221680927cb452335d70bc9bf2a /lib | |
| parent | 22f94a0a1616c9061c3282eded4ca7d9179cd0a5 (diff) | |
| download | src-de5fe5d53b634e506f94a6df3a9261aa20fa152f.tar.gz src-de5fe5d53b634e506f94a6df3a9261aa20fa152f.zip | |
rcsid[]->__FBSDID
Notes
Notes:
svn path=/head/; revision=86170
Diffstat (limited to 'lib')
55 files changed, 95 insertions, 248 deletions
diff --git a/lib/libc/string/bcmp.c b/lib/libc/string/bcmp.c index f8b06c3b2cab..6fd126532548 100644 --- a/lib/libc/string/bcmp.c +++ b/lib/libc/string/bcmp.c @@ -34,10 +34,8 @@ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)bcmp.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ -#ifndef lint -static const char rcsid[] = - "$FreeBSD$"; -#endif +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <string.h> diff --git a/lib/libc/string/bcopy.c b/lib/libc/string/bcopy.c index b7e6861d8f74..23cc00f2cfc6 100644 --- a/lib/libc/string/bcopy.c +++ b/lib/libc/string/bcopy.c @@ -37,12 +37,9 @@ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)bcopy.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ -#ifndef lint -static const char rcsid[] = - "$FreeBSD$"; -#endif - #include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); + #include <string.h> /* diff --git a/lib/libc/string/ffs.c b/lib/libc/string/ffs.c index 6998422ec73c..231bc259f99f 100644 --- a/lib/libc/string/ffs.c +++ b/lib/libc/string/ffs.c @@ -34,10 +34,8 @@ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)ffs.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ -#ifndef lint -static const char rcsid[] = - "$FreeBSD$"; -#endif +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <string.h> diff --git a/lib/libc/string/index.c b/lib/libc/string/index.c index 242e60907dee..1f7973a27adf 100644 --- a/lib/libc/string/index.c +++ b/lib/libc/string/index.c @@ -34,12 +34,9 @@ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)index.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ -#ifndef lint -static const char rcsid[] = - "$FreeBSD$"; -#endif - #include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); + #include <string.h> #include <stddef.h> diff --git a/lib/libc/string/memccpy.c b/lib/libc/string/memccpy.c index 9f7bbff1a14d..665fdb252cbe 100644 --- a/lib/libc/string/memccpy.c +++ b/lib/libc/string/memccpy.c @@ -34,12 +34,9 @@ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)memccpy.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ -#ifndef lint -static const char rcsid[] = - "$FreeBSD$"; -#endif - #include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); + #include <string.h> void * diff --git a/lib/libc/string/memchr.c b/lib/libc/string/memchr.c index dd9f13302686..16b2c77e212d 100644 --- a/lib/libc/string/memchr.c +++ b/lib/libc/string/memchr.c @@ -37,12 +37,9 @@ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)memchr.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ -#ifndef lint -static const char rcsid[] = - "$FreeBSD$"; -#endif - #include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); + #include <string.h> void * diff --git a/lib/libc/string/memcmp.c b/lib/libc/string/memcmp.c index b40e9fd7cc13..9711308bf6cd 100644 --- a/lib/libc/string/memcmp.c +++ b/lib/libc/string/memcmp.c @@ -37,12 +37,9 @@ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)memcmp.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ -#ifndef lint -static const char rcsid[] = - "$FreeBSD$"; -#endif - #include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); + #include <string.h> /* diff --git a/lib/libc/string/memset.c b/lib/libc/string/memset.c index 39f4a31ff51e..e08259dd4c24 100644 --- a/lib/libc/string/memset.c +++ b/lib/libc/string/memset.c @@ -37,10 +37,8 @@ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)memset.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ -#ifndef lint -static const char rcsid[] = - "$FreeBSD$"; -#endif +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <sys/types.h> diff --git a/lib/libc/string/rindex.c b/lib/libc/string/rindex.c index 1283db0c7e2e..fbf698be13d2 100644 --- a/lib/libc/string/rindex.c +++ b/lib/libc/string/rindex.c @@ -34,10 +34,8 @@ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)rindex.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ -#ifndef lint -static const char rcsid[] = - "$FreeBSD$"; -#endif +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <stddef.h> #include <string.h> diff --git a/lib/libc/string/strcasecmp.c b/lib/libc/string/strcasecmp.c index f1d4f38d6961..c280ef403dca 100644 --- a/lib/libc/string/strcasecmp.c +++ b/lib/libc/string/strcasecmp.c @@ -34,12 +34,9 @@ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)strcasecmp.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ -#ifndef lint -static const char rcsid[] = - "$FreeBSD$"; -#endif - #include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); + #include <string.h> #include <ctype.h> diff --git a/lib/libc/string/strcasestr.c b/lib/libc/string/strcasestr.c index b56c63b7f273..bbe25cb6e829 100644 --- a/lib/libc/string/strcasestr.c +++ b/lib/libc/string/strcasestr.c @@ -34,12 +34,9 @@ * SUCH DAMAGE. */ -#ifndef lint -static const char rcsid[] = - "$FreeBSD$"; -#endif - #include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); + #include <ctype.h> #include <string.h> diff --git a/lib/libc/string/strcat.c b/lib/libc/string/strcat.c index 480b2b48e4d0..4237d8a06daa 100644 --- a/lib/libc/string/strcat.c +++ b/lib/libc/string/strcat.c @@ -34,10 +34,8 @@ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)strcat.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ -#ifndef lint -static const char rcsid[] = - "$FreeBSD$"; -#endif +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <string.h> diff --git a/lib/libc/string/strcmp.c b/lib/libc/string/strcmp.c index da48f9100357..d444cc161774 100644 --- a/lib/libc/string/strcmp.c +++ b/lib/libc/string/strcmp.c @@ -37,12 +37,9 @@ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)strcmp.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ -#ifndef lint -static const char rcsid[] = - "$FreeBSD$"; -#endif - #include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); + #include <string.h> /* diff --git a/lib/libc/string/strcoll.c b/lib/libc/string/strcoll.c index 5f9cd694284b..a0daf8dc182f 100644 --- a/lib/libc/string/strcoll.c +++ b/lib/libc/string/strcoll.c @@ -25,10 +25,8 @@ * SUCH DAMAGE. */ -#ifndef lint -static const char rcsid[] = - "$FreeBSD$"; -#endif +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <stdlib.h> #include <string.h> diff --git a/lib/libc/string/strcpy.c b/lib/libc/string/strcpy.c index 4e26c943eb81..ce54d591c6bf 100644 --- a/lib/libc/string/strcpy.c +++ b/lib/libc/string/strcpy.c @@ -34,12 +34,9 @@ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)strcpy.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ -#ifndef lint -static const char rcsid[] = - "$FreeBSD$"; -#endif - #include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); + #include <string.h> char * diff --git a/lib/libc/string/strcspn.c b/lib/libc/string/strcspn.c index 6f693b033792..d4dac4dcd730 100644 --- a/lib/libc/string/strcspn.c +++ b/lib/libc/string/strcspn.c @@ -37,12 +37,9 @@ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)strcspn.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ -#ifndef lint -static const char rcsid[] = - "$FreeBSD$"; -#endif - #include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); + #include <string.h> /* diff --git a/lib/libc/string/strdup.c b/lib/libc/string/strdup.c index 55ba8cc1936a..788a185e54d1 100644 --- a/lib/libc/string/strdup.c +++ b/lib/libc/string/strdup.c @@ -34,10 +34,8 @@ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)strdup.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ -#ifndef lint -static const char rcsid[] = - "$FreeBSD$"; -#endif +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <stddef.h> #include <stdlib.h> diff --git a/lib/libc/string/strerror.c b/lib/libc/string/strerror.c index d64120f225ca..626e5d7287a7 100644 --- a/lib/libc/string/strerror.c +++ b/lib/libc/string/strerror.c @@ -34,10 +34,8 @@ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)strerror.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ -#ifndef lint -static const char rcsid[] = - "$FreeBSD$"; -#endif +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <stdio.h> #include <string.h> diff --git a/lib/libc/string/strlcat.c b/lib/libc/string/strlcat.c index 405389c9940e..71c502c3410f 100644 --- a/lib/libc/string/strlcat.c +++ b/lib/libc/string/strlcat.c @@ -28,12 +28,10 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -static char *rcsid = "$OpenBSD: strlcat.c,v 1.2 1999/06/17 16:28:58 millert Exp $"; +static char *rcsid = "$OpenBSD: strlcat.c,v 1.2 1999/06/17 16:28:58 millert Exp $"); #endif /* LIBC_SCCS and not lint */ -#ifndef lint -static const char rcsid[] = - "$FreeBSD$"; -#endif +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <sys/types.h> #include <string.h> diff --git a/lib/libc/string/strlcpy.c b/lib/libc/string/strlcpy.c index fde5ff5182df..30ec341f7e17 100644 --- a/lib/libc/string/strlcpy.c +++ b/lib/libc/string/strlcpy.c @@ -28,14 +28,10 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -#if 0 -static char *rcsid = "$OpenBSD: strlcpy.c,v 1.4 1999/05/01 18:56:41 millert Exp $"; -#endif +static char *rcsid = "$OpenBSD: strlcpy.c,v 1.4 1999/05/01 18:56:41 millert Exp $"); #endif /* LIBC_SCCS and not lint */ -#ifndef lint -static const char rcsid[] = - "$FreeBSD$"; -#endif +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <sys/types.h> #include <string.h> diff --git a/lib/libc/string/strlen.c b/lib/libc/string/strlen.c index e1c66e496e33..96076af4d8cb 100644 --- a/lib/libc/string/strlen.c +++ b/lib/libc/string/strlen.c @@ -34,12 +34,9 @@ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)strlen.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ -#ifndef lint -static const char rcsid[] = - "$FreeBSD$"; -#endif - #include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); + #include <string.h> size_t diff --git a/lib/libc/string/strmode.c b/lib/libc/string/strmode.c index a2bf3afe2be4..55b72c2823f1 100644 --- a/lib/libc/string/strmode.c +++ b/lib/libc/string/strmode.c @@ -34,10 +34,8 @@ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)strmode.c 8.3 (Berkeley) 8/15/94"; #endif /* LIBC_SCCS and not lint */ -#ifndef lint -static const char rcsid[] = - "$FreeBSD$"; -#endif +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <sys/types.h> #include <sys/stat.h> diff --git a/lib/libc/string/strncat.c b/lib/libc/string/strncat.c index c71cfa27aaf2..a03848fba7c7 100644 --- a/lib/libc/string/strncat.c +++ b/lib/libc/string/strncat.c @@ -37,12 +37,9 @@ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)strncat.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ -#ifndef lint -static const char rcsid[] = - "$FreeBSD$"; -#endif - #include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); + #include <string.h> /* diff --git a/lib/libc/string/strncmp.c b/lib/libc/string/strncmp.c index 4b2aa0107f5a..fff21f9ac0bd 100644 --- a/lib/libc/string/strncmp.c +++ b/lib/libc/string/strncmp.c @@ -34,12 +34,9 @@ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)strncmp.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ -#ifndef lint -static const char rcsid[] = - "$FreeBSD$"; -#endif - #include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); + #include <string.h> int diff --git a/lib/libc/string/strncpy.c b/lib/libc/string/strncpy.c index 772f8d285afa..c9a052548127 100644 --- a/lib/libc/string/strncpy.c +++ b/lib/libc/string/strncpy.c @@ -37,12 +37,9 @@ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)strncpy.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ -#ifndef lint -static const char rcsid[] = - "$FreeBSD$"; -#endif - #include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); + #include <string.h> /* diff --git a/lib/libc/string/strnstr.c b/lib/libc/string/strnstr.c index 98c01039ad8c..6983507b55db 100644 --- a/lib/libc/string/strnstr.c +++ b/lib/libc/string/strnstr.c @@ -35,8 +35,10 @@ * SUCH DAMAGE. */ +#if defined(LIBC_SCCS) && !defined(lint) +static char sccsid[] = "@(#)strstr.c 8.1 (Berkeley) 6/4/93"; +#endif /* LIBC_SCCS and not lint */ #include <sys/cdefs.h> -__RCSID("@(#)strstr.c 8.1 (Berkeley) 6/4/93"); __FBSDID("$FreeBSD$"); #include <string.h> diff --git a/lib/libc/string/strpbrk.c b/lib/libc/string/strpbrk.c index f5b7df3fc11b..e9196da8da99 100644 --- a/lib/libc/string/strpbrk.c +++ b/lib/libc/string/strpbrk.c @@ -34,12 +34,9 @@ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)strpbrk.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ -#ifndef lint -static const char rcsid[] = - "$FreeBSD$"; -#endif - #include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); + #include <string.h> /* diff --git a/lib/libc/string/strsep.c b/lib/libc/string/strsep.c index 485f65140c05..5e9fa9fdf113 100644 --- a/lib/libc/string/strsep.c +++ b/lib/libc/string/strsep.c @@ -31,17 +31,14 @@ * SUCH DAMAGE. */ -#include <sys/cdefs.h> -#include <string.h> -#include <stdio.h> - #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)strsep.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ -#ifndef lint -static const char rcsid[] = - "$FreeBSD$"; -#endif +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); + +#include <string.h> +#include <stdio.h> /* * Get next token from string *stringp, where tokens are possibly-empty diff --git a/lib/libc/string/strsignal.c b/lib/libc/string/strsignal.c index fd5f28879dec..330efa8bc53c 100644 --- a/lib/libc/string/strsignal.c +++ b/lib/libc/string/strsignal.c @@ -34,10 +34,8 @@ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)strerror.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ -#ifndef lint -static const char rcsid[] = - "$FreeBSD$"; -#endif +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <stdio.h> #include <string.h> diff --git a/lib/libc/string/strspn.c b/lib/libc/string/strspn.c index eb118e2aa8dd..6d2510f7d161 100644 --- a/lib/libc/string/strspn.c +++ b/lib/libc/string/strspn.c @@ -34,12 +34,9 @@ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)strspn.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ -#ifndef lint -static const char rcsid[] = - "$FreeBSD$"; -#endif - #include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); + #include <string.h> /* diff --git a/lib/libc/string/strstr.c b/lib/libc/string/strstr.c index aaa648619545..f8535ad12486 100644 --- a/lib/libc/string/strstr.c +++ b/lib/libc/string/strstr.c @@ -37,12 +37,9 @@ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)strstr.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ -#ifndef lint -static const char rcsid[] = - "$FreeBSD$"; -#endif - #include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); + #include <string.h> /* diff --git a/lib/libc/string/strtok.c b/lib/libc/string/strtok.c index 6af352970484..729ef1b27c7e 100644 --- a/lib/libc/string/strtok.c +++ b/lib/libc/string/strtok.c @@ -41,10 +41,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef lint -static const char rcsid[] = - "$FreeBSD$"; -#endif +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <stddef.h> #include <string.h> diff --git a/lib/libc/string/strxfrm.c b/lib/libc/string/strxfrm.c index 31922cf412fe..d19bdffd31e3 100644 --- a/lib/libc/string/strxfrm.c +++ b/lib/libc/string/strxfrm.c @@ -25,10 +25,8 @@ * SUCH DAMAGE. */ -#ifndef lint -static const char rcsid[] = - "$FreeBSD$"; -#endif +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <stdlib.h> #include <string.h> diff --git a/lib/libc/string/swab.c b/lib/libc/string/swab.c index da850868aa79..22710dfd7338 100644 --- a/lib/libc/string/swab.c +++ b/lib/libc/string/swab.c @@ -37,10 +37,8 @@ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)swab.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ -#ifndef lint -static const char rcsid[] = - "$FreeBSD$"; -#endif +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include <string.h> diff --git a/lib/libc/string/wcscat.c b/lib/libc/string/wcscat.c index 861822bb092e..391ca94d63fd 100644 --- a/lib/libc/string/wcscat.c +++ b/lib/libc/string/wcscat.c @@ -30,10 +30,7 @@ #if defined(LIBC_SCCS) && !defined(lint) __RCSID("$NetBSD: wcscat.c,v 1.1 2000/12/23 23:14:36 itojun Exp $"); #endif /* LIBC_SCCS and not lint */ -#ifndef lint -static const char rcsid[] = - "$FreeBSD$"; -#endif +__FBSDID("$FreeBSD$"); #include <assert.h> #include <wchar.h> diff --git a/lib/libc/string/wcschr.c b/lib/libc/string/wcschr.c index 6eebfbacf63a..ad713f961123 100644 --- a/lib/libc/string/wcschr.c +++ b/lib/libc/string/wcschr.c @@ -30,10 +30,7 @@ #if defined(LIBC_SCCS) && !defined(lint) __RCSID("$NetBSD: wcschr.c,v 1.1 2000/12/23 23:14:36 itojun Exp $"); #endif /* LIBC_SCCS and not lint */ -#ifndef lint -static const char rcsid[] = - "$FreeBSD$"; -#endif +__FBSDID("$FreeBSD$"); #include <assert.h> #include <wchar.h> diff --git a/lib/libc/string/wcscmp.c b/lib/libc/string/wcscmp.c index dcf9b57e7357..f25479cc65d6 100644 --- a/lib/libc/string/wcscmp.c +++ b/lib/libc/string/wcscmp.c @@ -36,16 +36,10 @@ #include <sys/cdefs.h> #if defined(LIBC_SCCS) && !defined(lint) -#if 0 static char sccsid[] = "@(#)strcmp.c 8.1 (Berkeley) 6/4/93"; -#else __RCSID("$NetBSD$"); -#endif #endif /* LIBC_SCCS and not lint */ -#ifndef lint -static const char rcsid[] = - "$FreeBSD$"; -#endif +__FBSDID("$FreeBSD$"); #include <assert.h> #include <wchar.h> diff --git a/lib/libc/string/wcscpy.c b/lib/libc/string/wcscpy.c index d05804af1431..890d27ade6fa 100644 --- a/lib/libc/string/wcscpy.c +++ b/lib/libc/string/wcscpy.c @@ -30,10 +30,7 @@ #if defined(LIBC_SCCS) && !defined(lint) __RCSID("$NetBSD: wcscpy.c,v 1.1 2000/12/23 23:14:36 itojun Exp $"); #endif /* LIBC_SCCS and not lint */ -#ifndef lint -static const char rcsid[] = - "$FreeBSD$"; -#endif +__FBSDID("$FreeBSD$"); #include <assert.h> #include <wchar.h> diff --git a/lib/libc/string/wcscspn.c b/lib/libc/string/wcscspn.c index 7309574625c8..334b60b4c7d2 100644 --- a/lib/libc/string/wcscspn.c +++ b/lib/libc/string/wcscspn.c @@ -30,10 +30,7 @@ #if defined(LIBC_SCCS) && !defined(lint) __RCSID("$NetBSD: wcscspn.c,v 1.1 2000/12/23 23:14:36 itojun Exp $"); #endif /* LIBC_SCCS and not lint */ -#ifndef lint -static const char rcsid[] = - "$FreeBSD$"; -#endif +__FBSDID("$FreeBSD$"); #include <assert.h> #include <wchar.h> diff --git a/lib/libc/string/wcslcat.c b/lib/libc/string/wcslcat.c index 3634bfd5be3a..fd81fcaab24a 100644 --- a/lib/libc/string/wcslcat.c +++ b/lib/libc/string/wcslcat.c @@ -31,10 +31,7 @@ #if defined(LIBC_SCCS) && !defined(lint) __RCSID("$NetBSD: wcslcat.c,v 1.1 2000/12/23 23:14:36 itojun Exp $"); #endif /* LIBC_SCCS and not lint */ -#ifndef lint -static const char rcsid[] = - "$FreeBSD$"; -#endif +__FBSDID("$FreeBSD$"); #include <sys/types.h> #include <assert.h> diff --git a/lib/libc/string/wcslcpy.c b/lib/libc/string/wcslcpy.c index 240feb4b5bd3..1cde15f42c6f 100644 --- a/lib/libc/string/wcslcpy.c +++ b/lib/libc/string/wcslcpy.c @@ -31,10 +31,7 @@ #if defined(LIBC_SCCS) && !defined(lint) __RCSID("$NetBSD: wcslcpy.c,v 1.1 2000/12/23 23:14:36 itojun Exp $"); #endif /* LIBC_SCCS and not lint */ -#ifndef lint -static const char rcsid[] = - "$FreeBSD$"; -#endif +__FBSDID("$FreeBSD$"); #include <sys/types.h> #include <assert.h> diff --git a/lib/libc/string/wcslen.c b/lib/libc/string/wcslen.c index 8e3039510b8b..852a82970732 100644 --- a/lib/libc/string/wcslen.c +++ b/lib/libc/string/wcslen.c @@ -30,10 +30,7 @@ #if defined(LIBC_SCCS) && !defined(lint) __RCSID("$NetBSD: wcslen.c,v 1.1 2000/12/23 23:14:36 itojun Exp $"); #endif /* LIBC_SCCS and not lint */ -#ifndef lint -static const char rcsid[] = - "$FreeBSD$"; -#endif +__FBSDID("$FreeBSD$"); #include <assert.h> #include <wchar.h> diff --git a/lib/libc/string/wcsncat.c b/lib/libc/string/wcsncat.c index 8d98bdb44293..c4103c525d37 100644 --- a/lib/libc/string/wcsncat.c +++ b/lib/libc/string/wcsncat.c @@ -30,10 +30,7 @@ #if defined(LIBC_SCCS) && !defined(lint) __RCSID("$NetBSD: wcsncat.c,v 1.1 2000/12/23 23:14:36 itojun Exp $"); #endif /* LIBC_SCCS and not lint */ -#ifndef lint -static const char rcsid[] = - "$FreeBSD$"; -#endif +__FBSDID("$FreeBSD$"); #include <assert.h> #include <wchar.h> diff --git a/lib/libc/string/wcsncmp.c b/lib/libc/string/wcsncmp.c index bc1abe7ecbbf..01d995c564d6 100644 --- a/lib/libc/string/wcsncmp.c +++ b/lib/libc/string/wcsncmp.c @@ -33,16 +33,10 @@ #include <sys/cdefs.h> #if defined(LIBC_SCCS) && !defined(lint) -#if 0 static char sccsid[] = "@(#)strncmp.c 8.1 (Berkeley) 6/4/93"; -#else __RCSID("$NetBSD$"); -#endif #endif /* LIBC_SCCS and not lint */ -#ifndef lint -static const char rcsid[] = - "$FreeBSD$"; -#endif +__FBSDID("$FreeBSD$"); #include <assert.h> #include <wchar.h> diff --git a/lib/libc/string/wcsncpy.c b/lib/libc/string/wcsncpy.c index 907344b56771..1660bbc62259 100644 --- a/lib/libc/string/wcsncpy.c +++ b/lib/libc/string/wcsncpy.c @@ -30,10 +30,7 @@ #if defined(LIBC_SCCS) && !defined(lint) __RCSID("$NetBSD: wcsncpy.c,v 1.1 2000/12/23 23:14:36 itojun Exp $"); #endif /* LIBC_SCCS and not lint */ -#ifndef lint -static const char rcsid[] = - "$FreeBSD$"; -#endif +__FBSDID("$FreeBSD$"); #include <assert.h> #include <wchar.h> diff --git a/lib/libc/string/wcspbrk.c b/lib/libc/string/wcspbrk.c index 2808ed25a278..e2d24a7ba6cd 100644 --- a/lib/libc/string/wcspbrk.c +++ b/lib/libc/string/wcspbrk.c @@ -30,10 +30,7 @@ #if defined(LIBC_SCCS) && !defined(lint) __RCSID("$NetBSD: wcspbrk.c,v 1.1 2000/12/23 23:14:37 itojun Exp $"); #endif /* LIBC_SCCS and not lint */ -#ifndef lint -static const char rcsid[] = - "$FreeBSD$"; -#endif +__FBSDID("$FreeBSD$"); #include <assert.h> #include <wchar.h> diff --git a/lib/libc/string/wcsrchr.c b/lib/libc/string/wcsrchr.c index 4dc9b4bf7bb3..96365754d938 100644 --- a/lib/libc/string/wcsrchr.c +++ b/lib/libc/string/wcsrchr.c @@ -30,10 +30,7 @@ #if defined(LIBC_SCCS) && !defined(lint) __RCSID("$NetBSD: wcsrchr.c,v 1.1 2000/12/23 23:14:37 itojun Exp $"); #endif /* LIBC_SCCS and not lint */ -#ifndef lint -static const char rcsid[] = - "$FreeBSD$"; -#endif +__FBSDID("$FreeBSD$"); #include <assert.h> #include <wchar.h> diff --git a/lib/libc/string/wcsspn.c b/lib/libc/string/wcsspn.c index 40b583b3eb55..69aa628da48a 100644 --- a/lib/libc/string/wcsspn.c +++ b/lib/libc/string/wcsspn.c @@ -30,10 +30,7 @@ #if defined(LIBC_SCCS) && !defined(lint) __RCSID("$NetBSD: wcsspn.c,v 1.1 2000/12/23 23:14:37 itojun Exp $"); #endif /* LIBC_SCCS and not lint */ -#ifndef lint -static const char rcsid[] = - "$FreeBSD$"; -#endif +__FBSDID("$FreeBSD$"); #include <assert.h> #include <wchar.h> diff --git a/lib/libc/string/wcsstr.c b/lib/libc/string/wcsstr.c index 1e4cf215ba69..1f7137d01d72 100644 --- a/lib/libc/string/wcsstr.c +++ b/lib/libc/string/wcsstr.c @@ -30,10 +30,7 @@ #if defined(LIBC_SCCS) && !defined(lint) __RCSID("$NetBSD: wcsstr.c,v 1.1 2000/12/23 23:14:37 itojun Exp $"); #endif /* LIBC_SCCS and not lint */ -#ifndef lint -static const char rcsid[] = - "$FreeBSD$"; -#endif +__FBSDID("$FreeBSD$"); #include <assert.h> #include <wchar.h> diff --git a/lib/libc/string/wcswidth.c b/lib/libc/string/wcswidth.c index 3ad70c1422a8..e484dacd6759 100644 --- a/lib/libc/string/wcswidth.c +++ b/lib/libc/string/wcswidth.c @@ -30,10 +30,7 @@ #if defined(LIBC_SCCS) && !defined(lint) __RCSID("$NetBSD: wcswidth.c,v 1.1 2000/12/23 23:14:37 itojun Exp $"); #endif /* LIBC_SCCS and not lint */ -#ifndef lint -static const char rcsid[] = - "$FreeBSD$"; -#endif +__FBSDID("$FreeBSD$"); #include <assert.h> #include <wchar.h> diff --git a/lib/libc/string/wmemchr.c b/lib/libc/string/wmemchr.c index fa49a7485776..61fa4a2c7a71 100644 --- a/lib/libc/string/wmemchr.c +++ b/lib/libc/string/wmemchr.c @@ -30,10 +30,7 @@ #if defined(LIBC_SCCS) && !defined(lint) __RCSID("$NetBSD: wmemchr.c,v 1.1 2000/12/23 23:14:37 itojun Exp $"); #endif /* LIBC_SCCS and not lint */ -#ifndef lint -static const char rcsid[] = - "$FreeBSD$"; -#endif +__FBSDID("$FreeBSD$"); #include <assert.h> #include <wchar.h> diff --git a/lib/libc/string/wmemcmp.c b/lib/libc/string/wmemcmp.c index 158bf09a202e..d47c332197bb 100644 --- a/lib/libc/string/wmemcmp.c +++ b/lib/libc/string/wmemcmp.c @@ -30,10 +30,7 @@ #if defined(LIBC_SCCS) && !defined(lint) __RCSID("$NetBSD: wmemcmp.c,v 1.1 2000/12/23 23:14:37 itojun Exp $"); #endif /* LIBC_SCCS and not lint */ -#ifndef lint -static const char rcsid[] = - "$FreeBSD$"; -#endif +__FBSDID("$FreeBSD$"); #include <assert.h> #include <wchar.h> diff --git a/lib/libc/string/wmemcpy.c b/lib/libc/string/wmemcpy.c index bb8d05858501..14888be9328d 100644 --- a/lib/libc/string/wmemcpy.c +++ b/lib/libc/string/wmemcpy.c @@ -30,10 +30,7 @@ #if defined(LIBC_SCCS) && !defined(lint) __RCSID("$NetBSD: wmemcpy.c,v 1.1 2000/12/23 23:14:37 itojun Exp $"); #endif /* LIBC_SCCS and not lint */ -#ifndef lint -static const char rcsid[] = - "$FreeBSD$"; -#endif +__FBSDID("$FreeBSD$"); #include <assert.h> #include <string.h> diff --git a/lib/libc/string/wmemmove.c b/lib/libc/string/wmemmove.c index edf8d1d8290c..ef37044795d7 100644 --- a/lib/libc/string/wmemmove.c +++ b/lib/libc/string/wmemmove.c @@ -30,10 +30,7 @@ #if defined(LIBC_SCCS) && !defined(lint) __RCSID("$NetBSD: wmemmove.c,v 1.1 2000/12/23 23:14:37 itojun Exp $"); #endif /* LIBC_SCCS and not lint */ -#ifndef lint -static const char rcsid[] = - "$FreeBSD$"; -#endif +__FBSDID("$FreeBSD$"); #include <assert.h> #include <string.h> diff --git a/lib/libc/string/wmemset.c b/lib/libc/string/wmemset.c index 08ce087b2931..569b65d20dae 100644 --- a/lib/libc/string/wmemset.c +++ b/lib/libc/string/wmemset.c @@ -30,10 +30,7 @@ #if defined(LIBC_SCCS) && !defined(lint) __RCSID("$NetBSD: wmemset.c,v 1.1 2000/12/23 23:14:37 itojun Exp $"); #endif /* LIBC_SCCS and not lint */ -#ifndef lint -static const char rcsid[] = - "$FreeBSD$"; -#endif +__FBSDID("$FreeBSD$"); #include <assert.h> #include <wchar.h> |