From d1bf0c4841834d6932a27295f99f70d9f55e62d1 Mon Sep 17 00:00:00 2001 From: obrien Date: Wed, 7 Nov 2001 19:55:16 +0000 Subject: rcsid[]->__FBSDID --- lib/libc/string/bcmp.c | 6 ++---- lib/libc/string/bcopy.c | 7 ++----- lib/libc/string/ffs.c | 6 ++---- lib/libc/string/index.c | 7 ++----- lib/libc/string/memccpy.c | 7 ++----- lib/libc/string/memchr.c | 7 ++----- lib/libc/string/memcmp.c | 7 ++----- lib/libc/string/memset.c | 6 ++---- lib/libc/string/rindex.c | 6 ++---- lib/libc/string/strcasecmp.c | 7 ++----- lib/libc/string/strcasestr.c | 7 ++----- lib/libc/string/strcat.c | 6 ++---- lib/libc/string/strcmp.c | 7 ++----- lib/libc/string/strcoll.c | 6 ++---- lib/libc/string/strcpy.c | 7 ++----- lib/libc/string/strcspn.c | 7 ++----- lib/libc/string/strdup.c | 6 ++---- lib/libc/string/strerror.c | 6 ++---- lib/libc/string/strlcat.c | 8 +++----- lib/libc/string/strlcpy.c | 10 +++------- lib/libc/string/strlen.c | 7 ++----- lib/libc/string/strmode.c | 6 ++---- lib/libc/string/strncat.c | 7 ++----- lib/libc/string/strncmp.c | 7 ++----- lib/libc/string/strncpy.c | 7 ++----- lib/libc/string/strnstr.c | 4 +++- lib/libc/string/strpbrk.c | 7 ++----- lib/libc/string/strsep.c | 13 +++++-------- lib/libc/string/strsignal.c | 6 ++---- lib/libc/string/strspn.c | 7 ++----- lib/libc/string/strstr.c | 7 ++----- lib/libc/string/strtok.c | 6 ++---- lib/libc/string/strxfrm.c | 6 ++---- lib/libc/string/swab.c | 6 ++---- lib/libc/string/wcscat.c | 5 +---- lib/libc/string/wcschr.c | 5 +---- lib/libc/string/wcscmp.c | 8 +------- lib/libc/string/wcscpy.c | 5 +---- lib/libc/string/wcscspn.c | 5 +---- lib/libc/string/wcslcat.c | 5 +---- lib/libc/string/wcslcpy.c | 5 +---- lib/libc/string/wcslen.c | 5 +---- lib/libc/string/wcsncat.c | 5 +---- lib/libc/string/wcsncmp.c | 8 +------- lib/libc/string/wcsncpy.c | 5 +---- lib/libc/string/wcspbrk.c | 5 +---- lib/libc/string/wcsrchr.c | 5 +---- lib/libc/string/wcsspn.c | 5 +---- lib/libc/string/wcsstr.c | 5 +---- lib/libc/string/wcswidth.c | 5 +---- lib/libc/string/wmemchr.c | 5 +---- lib/libc/string/wmemcmp.c | 5 +---- lib/libc/string/wmemcpy.c | 5 +---- lib/libc/string/wmemmove.c | 5 +---- lib/libc/string/wmemset.c | 5 +---- 55 files changed, 95 insertions(+), 248 deletions(-) (limited to 'lib/libc/string') diff --git a/lib/libc/string/bcmp.c b/lib/libc/string/bcmp.c index f8b06c3b..6fd1265 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 +__FBSDID("$FreeBSD$"); #include diff --git a/lib/libc/string/bcopy.c b/lib/libc/string/bcopy.c index b7e6861..23cc00f 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 +__FBSDID("$FreeBSD$"); + #include /* diff --git a/lib/libc/string/ffs.c b/lib/libc/string/ffs.c index 6998422..231bc25 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 +__FBSDID("$FreeBSD$"); #include diff --git a/lib/libc/string/index.c b/lib/libc/string/index.c index 242e609..1f7973a 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 +__FBSDID("$FreeBSD$"); + #include #include diff --git a/lib/libc/string/memccpy.c b/lib/libc/string/memccpy.c index 9f7bbff..665fdb2 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 +__FBSDID("$FreeBSD$"); + #include void * diff --git a/lib/libc/string/memchr.c b/lib/libc/string/memchr.c index dd9f133..16b2c77 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 +__FBSDID("$FreeBSD$"); + #include void * diff --git a/lib/libc/string/memcmp.c b/lib/libc/string/memcmp.c index b40e9fd..9711308 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 +__FBSDID("$FreeBSD$"); + #include /* diff --git a/lib/libc/string/memset.c b/lib/libc/string/memset.c index 39f4a31..e08259d 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 +__FBSDID("$FreeBSD$"); #include diff --git a/lib/libc/string/rindex.c b/lib/libc/string/rindex.c index 1283db0..fbf698b 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 +__FBSDID("$FreeBSD$"); #include #include diff --git a/lib/libc/string/strcasecmp.c b/lib/libc/string/strcasecmp.c index f1d4f38..c280ef4 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 +__FBSDID("$FreeBSD$"); + #include #include diff --git a/lib/libc/string/strcasestr.c b/lib/libc/string/strcasestr.c index b56c63b..bbe25cb 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 +__FBSDID("$FreeBSD$"); + #include #include diff --git a/lib/libc/string/strcat.c b/lib/libc/string/strcat.c index 480b2b4..4237d8a 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 +__FBSDID("$FreeBSD$"); #include diff --git a/lib/libc/string/strcmp.c b/lib/libc/string/strcmp.c index da48f91..d444cc1 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 +__FBSDID("$FreeBSD$"); + #include /* diff --git a/lib/libc/string/strcoll.c b/lib/libc/string/strcoll.c index 5f9cd69..a0daf8d 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 +__FBSDID("$FreeBSD$"); #include #include diff --git a/lib/libc/string/strcpy.c b/lib/libc/string/strcpy.c index 4e26c94..ce54d59 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 +__FBSDID("$FreeBSD$"); + #include char * diff --git a/lib/libc/string/strcspn.c b/lib/libc/string/strcspn.c index 6f693b03..d4dac4d 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 +__FBSDID("$FreeBSD$"); + #include /* diff --git a/lib/libc/string/strdup.c b/lib/libc/string/strdup.c index 55ba8cc..788a185 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 +__FBSDID("$FreeBSD$"); #include #include diff --git a/lib/libc/string/strerror.c b/lib/libc/string/strerror.c index d64120f..626e5d7 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 +__FBSDID("$FreeBSD$"); #include #include diff --git a/lib/libc/string/strlcat.c b/lib/libc/string/strlcat.c index 405389c..71c502c 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 +__FBSDID("$FreeBSD$"); #include #include diff --git a/lib/libc/string/strlcpy.c b/lib/libc/string/strlcpy.c index fde5ff5..30ec341 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 +__FBSDID("$FreeBSD$"); #include #include diff --git a/lib/libc/string/strlen.c b/lib/libc/string/strlen.c index e1c66e4..96076af 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 +__FBSDID("$FreeBSD$"); + #include size_t diff --git a/lib/libc/string/strmode.c b/lib/libc/string/strmode.c index a2bf3af..55b72c2 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 +__FBSDID("$FreeBSD$"); #include #include diff --git a/lib/libc/string/strncat.c b/lib/libc/string/strncat.c index c71cfa2..a03848f 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 +__FBSDID("$FreeBSD$"); + #include /* diff --git a/lib/libc/string/strncmp.c b/lib/libc/string/strncmp.c index 4b2aa01..fff21f9 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 +__FBSDID("$FreeBSD$"); + #include int diff --git a/lib/libc/string/strncpy.c b/lib/libc/string/strncpy.c index 772f8d2..c9a0525 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 +__FBSDID("$FreeBSD$"); + #include /* diff --git a/lib/libc/string/strnstr.c b/lib/libc/string/strnstr.c index 98c0103..6983507 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 -__RCSID("@(#)strstr.c 8.1 (Berkeley) 6/4/93"); __FBSDID("$FreeBSD$"); #include diff --git a/lib/libc/string/strpbrk.c b/lib/libc/string/strpbrk.c index f5b7df3..e9196da 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 +__FBSDID("$FreeBSD$"); + #include /* diff --git a/lib/libc/string/strsep.c b/lib/libc/string/strsep.c index 485f651..5e9fa9f 100644 --- a/lib/libc/string/strsep.c +++ b/lib/libc/string/strsep.c @@ -31,17 +31,14 @@ * SUCH DAMAGE. */ -#include -#include -#include - #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 +__FBSDID("$FreeBSD$"); + +#include +#include /* * 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 fd5f288..330efa8 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 +__FBSDID("$FreeBSD$"); #include #include diff --git a/lib/libc/string/strspn.c b/lib/libc/string/strspn.c index eb118e2..6d2510f 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 +__FBSDID("$FreeBSD$"); + #include /* diff --git a/lib/libc/string/strstr.c b/lib/libc/string/strstr.c index aaa6486..f8535ad1 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 +__FBSDID("$FreeBSD$"); + #include /* diff --git a/lib/libc/string/strtok.c b/lib/libc/string/strtok.c index 6af3529..729ef1b 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 +__FBSDID("$FreeBSD$"); #include #include diff --git a/lib/libc/string/strxfrm.c b/lib/libc/string/strxfrm.c index 31922cf..d19bdff 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 +__FBSDID("$FreeBSD$"); #include #include diff --git a/lib/libc/string/swab.c b/lib/libc/string/swab.c index da85086..22710df 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 +__FBSDID("$FreeBSD$"); #include diff --git a/lib/libc/string/wcscat.c b/lib/libc/string/wcscat.c index 861822b..391ca94 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 #include diff --git a/lib/libc/string/wcschr.c b/lib/libc/string/wcschr.c index 6eebfba..ad713f9 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 #include diff --git a/lib/libc/string/wcscmp.c b/lib/libc/string/wcscmp.c index dcf9b57..f25479c 100644 --- a/lib/libc/string/wcscmp.c +++ b/lib/libc/string/wcscmp.c @@ -36,16 +36,10 @@ #include #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 #include diff --git a/lib/libc/string/wcscpy.c b/lib/libc/string/wcscpy.c index d05804a..890d27a 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 #include diff --git a/lib/libc/string/wcscspn.c b/lib/libc/string/wcscspn.c index 7309574..334b60b 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 #include diff --git a/lib/libc/string/wcslcat.c b/lib/libc/string/wcslcat.c index 3634bfd..fd81fca 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 #include diff --git a/lib/libc/string/wcslcpy.c b/lib/libc/string/wcslcpy.c index 240feb4..1cde15f 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 #include diff --git a/lib/libc/string/wcslen.c b/lib/libc/string/wcslen.c index 8e30395..852a829 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 #include diff --git a/lib/libc/string/wcsncat.c b/lib/libc/string/wcsncat.c index 8d98bdb..c4103c5 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 #include diff --git a/lib/libc/string/wcsncmp.c b/lib/libc/string/wcsncmp.c index bc1abe7..01d995c 100644 --- a/lib/libc/string/wcsncmp.c +++ b/lib/libc/string/wcsncmp.c @@ -33,16 +33,10 @@ #include #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 #include diff --git a/lib/libc/string/wcsncpy.c b/lib/libc/string/wcsncpy.c index 907344b..1660bbc 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 #include diff --git a/lib/libc/string/wcspbrk.c b/lib/libc/string/wcspbrk.c index 2808ed2..e2d24a7 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 #include diff --git a/lib/libc/string/wcsrchr.c b/lib/libc/string/wcsrchr.c index 4dc9b4b..9636575 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 #include diff --git a/lib/libc/string/wcsspn.c b/lib/libc/string/wcsspn.c index 40b583b..69aa628 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 #include diff --git a/lib/libc/string/wcsstr.c b/lib/libc/string/wcsstr.c index 1e4cf21..1f7137d 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 #include diff --git a/lib/libc/string/wcswidth.c b/lib/libc/string/wcswidth.c index 3ad70c1..e484dac 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 #include diff --git a/lib/libc/string/wmemchr.c b/lib/libc/string/wmemchr.c index fa49a74..61fa4a2 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 #include diff --git a/lib/libc/string/wmemcmp.c b/lib/libc/string/wmemcmp.c index 158bf09..d47c332 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 #include diff --git a/lib/libc/string/wmemcpy.c b/lib/libc/string/wmemcpy.c index bb8d058..14888be 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 #include diff --git a/lib/libc/string/wmemmove.c b/lib/libc/string/wmemmove.c index edf8d1d..ef37044 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 #include diff --git a/lib/libc/string/wmemset.c b/lib/libc/string/wmemset.c index 08ce087..569b65d 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 #include -- cgit v1.1