diff options
author | David E. O'Brien <obrien@FreeBSD.org> | 2001-05-24 08:47:42 +0000 |
---|---|---|
committer | David E. O'Brien <obrien@FreeBSD.org> | 2001-05-24 08:47:42 +0000 |
commit | 5864b79cd2852339f3025ee81769233071d60934 (patch) | |
tree | b468e5ee2b4272d5130141a79d342729b5f7e14e | |
parent | ac8f990bdebc788c11f8449ca0fd90b65c3b9048 (diff) |
Notes
56 files changed, 237 insertions, 95 deletions
diff --git a/lib/libc/string/bcmp.c b/lib/libc/string/bcmp.c index 5a3ae616800e5..f8b06c3b2cabf 100644 --- a/lib/libc/string/bcmp.c +++ b/lib/libc/string/bcmp.c @@ -34,6 +34,10 @@ #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 <string.h> diff --git a/lib/libc/string/bcopy.c b/lib/libc/string/bcopy.c index f90b09c9b73f7..b7e6861d8f74e 100644 --- a/lib/libc/string/bcopy.c +++ b/lib/libc/string/bcopy.c @@ -37,6 +37,10 @@ #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> #include <string.h> diff --git a/lib/libc/string/ffs.c b/lib/libc/string/ffs.c index 099ff8e4c911e..6998422ec73c7 100644 --- a/lib/libc/string/ffs.c +++ b/lib/libc/string/ffs.c @@ -34,6 +34,10 @@ #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 <string.h> diff --git a/lib/libc/string/index.c b/lib/libc/string/index.c index 37e505fa998f7..242e60907deed 100644 --- a/lib/libc/string/index.c +++ b/lib/libc/string/index.c @@ -34,6 +34,10 @@ #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> #include <string.h> diff --git a/lib/libc/string/memccpy.c b/lib/libc/string/memccpy.c index c457110b62d3a..9f7bbff1a14d2 100644 --- a/lib/libc/string/memccpy.c +++ b/lib/libc/string/memccpy.c @@ -34,6 +34,10 @@ #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> #include <string.h> diff --git a/lib/libc/string/memchr.c b/lib/libc/string/memchr.c index 7200894c1a72d..dd9f133026862 100644 --- a/lib/libc/string/memchr.c +++ b/lib/libc/string/memchr.c @@ -37,6 +37,10 @@ #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> #include <string.h> diff --git a/lib/libc/string/memcmp.c b/lib/libc/string/memcmp.c index d025d897b34a6..b40e9fd7cc13d 100644 --- a/lib/libc/string/memcmp.c +++ b/lib/libc/string/memcmp.c @@ -37,6 +37,10 @@ #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> #include <string.h> diff --git a/lib/libc/string/memset.c b/lib/libc/string/memset.c index afe5f9642b83a..39f4a31ff51e3 100644 --- a/lib/libc/string/memset.c +++ b/lib/libc/string/memset.c @@ -37,6 +37,10 @@ #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/types.h> diff --git a/lib/libc/string/rindex.c b/lib/libc/string/rindex.c index 69dced4c46dca..1283db0c7e2e4 100644 --- a/lib/libc/string/rindex.c +++ b/lib/libc/string/rindex.c @@ -34,6 +34,10 @@ #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 <stddef.h> #include <string.h> diff --git a/lib/libc/string/strcasecmp.c b/lib/libc/string/strcasecmp.c index 463c4dee3c25e..f1d4f38d69619 100644 --- a/lib/libc/string/strcasecmp.c +++ b/lib/libc/string/strcasecmp.c @@ -31,13 +31,17 @@ * SUCH DAMAGE. */ -#include <sys/cdefs.h> -#include <string.h> -#include <ctype.h> - #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> +#include <string.h> +#include <ctype.h> typedef unsigned char u_char; diff --git a/lib/libc/string/strcat.c b/lib/libc/string/strcat.c index 95dcd1d7029c4..480b2b48e4d07 100644 --- a/lib/libc/string/strcat.c +++ b/lib/libc/string/strcat.c @@ -34,6 +34,10 @@ #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 <string.h> diff --git a/lib/libc/string/strcmp.c b/lib/libc/string/strcmp.c index cf25e504b2d8d..da48f91003576 100644 --- a/lib/libc/string/strcmp.c +++ b/lib/libc/string/strcmp.c @@ -37,6 +37,10 @@ #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> #include <string.h> diff --git a/lib/libc/string/strcoll.c b/lib/libc/string/strcoll.c index 5213cf84d978d..5f9cd694284b9 100644 --- a/lib/libc/string/strcoll.c +++ b/lib/libc/string/strcoll.c @@ -23,10 +23,13 @@ * 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. - * - * $FreeBSD$ */ +#ifndef lint +static const char rcsid[] = + "$FreeBSD$"; +#endif + #include <stdlib.h> #include <string.h> #include "collate.h" diff --git a/lib/libc/string/strcpy.c b/lib/libc/string/strcpy.c index c9b44b13b125b..4e26c943eb81e 100644 --- a/lib/libc/string/strcpy.c +++ b/lib/libc/string/strcpy.c @@ -34,6 +34,10 @@ #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> #include <string.h> diff --git a/lib/libc/string/strcspn.c b/lib/libc/string/strcspn.c index a1c2e1d3d7b4d..6f693b0337929 100644 --- a/lib/libc/string/strcspn.c +++ b/lib/libc/string/strcspn.c @@ -37,6 +37,10 @@ #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> #include <string.h> diff --git a/lib/libc/string/strdup.c b/lib/libc/string/strdup.c index a1c2eedaf891e..55ba8cc1936aa 100644 --- a/lib/libc/string/strdup.c +++ b/lib/libc/string/strdup.c @@ -34,6 +34,10 @@ #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 <stddef.h> #include <stdlib.h> diff --git a/lib/libc/string/strerror.c b/lib/libc/string/strerror.c index 5acefd95ee211..d64120f225ca9 100644 --- a/lib/libc/string/strerror.c +++ b/lib/libc/string/strerror.c @@ -34,6 +34,10 @@ #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 <stdio.h> #include <string.h> diff --git a/lib/libc/string/strlcat.c b/lib/libc/string/strlcat.c index 5bc2c91b9baa7..c325ef332f3de 100644 --- a/lib/libc/string/strlcat.c +++ b/lib/libc/string/strlcat.c @@ -25,13 +25,15 @@ * 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. - * - * $FreeBSD$ */ #if defined(LIBC_SCCS) && !defined(lint) 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/types.h> #include <string.h> diff --git a/lib/libc/string/strlcpy.c b/lib/libc/string/strlcpy.c index 300a28bc3911f..fde5ff5182dff 100644 --- a/lib/libc/string/strlcpy.c +++ b/lib/libc/string/strlcpy.c @@ -28,8 +28,14 @@ */ #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 #endif /* LIBC_SCCS and not lint */ +#ifndef lint +static const char rcsid[] = + "$FreeBSD$"; +#endif #include <sys/types.h> #include <string.h> diff --git a/lib/libc/string/strlen.c b/lib/libc/string/strlen.c index 323fbe4845265..e1c66e496e33f 100644 --- a/lib/libc/string/strlen.c +++ b/lib/libc/string/strlen.c @@ -34,6 +34,10 @@ #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> #include <string.h> diff --git a/lib/libc/string/strmode.c b/lib/libc/string/strmode.c index 2c3f44a945611..a2bf3afe2be40 100644 --- a/lib/libc/string/strmode.c +++ b/lib/libc/string/strmode.c @@ -34,6 +34,10 @@ #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/types.h> #include <sys/stat.h> diff --git a/lib/libc/string/strncat.c b/lib/libc/string/strncat.c index 1b82a75fa5dc4..c71cfa27aaf27 100644 --- a/lib/libc/string/strncat.c +++ b/lib/libc/string/strncat.c @@ -37,6 +37,10 @@ #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> #include <string.h> diff --git a/lib/libc/string/strncmp.c b/lib/libc/string/strncmp.c index 4b701a9a385d2..4b2aa0107f5a2 100644 --- a/lib/libc/string/strncmp.c +++ b/lib/libc/string/strncmp.c @@ -34,6 +34,10 @@ #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> #include <string.h> diff --git a/lib/libc/string/strncpy.c b/lib/libc/string/strncpy.c index 9e72740b8b9f2..772f8d285afa4 100644 --- a/lib/libc/string/strncpy.c +++ b/lib/libc/string/strncpy.c @@ -37,6 +37,10 @@ #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> #include <string.h> diff --git a/lib/libc/string/strpbrk.c b/lib/libc/string/strpbrk.c index 119d8b793f229..f5b7df3fc11bd 100644 --- a/lib/libc/string/strpbrk.c +++ b/lib/libc/string/strpbrk.c @@ -34,6 +34,10 @@ #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> #include <string.h> diff --git a/lib/libc/string/strsep.c b/lib/libc/string/strsep.c index ddad5964ce193..485f65140c056 100644 --- a/lib/libc/string/strsep.c +++ b/lib/libc/string/strsep.c @@ -38,6 +38,10 @@ #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 /* * 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 5ec6365fbd930..fd5f28879deca 100644 --- a/lib/libc/string/strsignal.c +++ b/lib/libc/string/strsignal.c @@ -34,6 +34,10 @@ #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 <stdio.h> #include <string.h> diff --git a/lib/libc/string/strspn.c b/lib/libc/string/strspn.c index 4676bd4923dcc..eb118e2aa8ddf 100644 --- a/lib/libc/string/strspn.c +++ b/lib/libc/string/strspn.c @@ -34,6 +34,10 @@ #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> #include <string.h> diff --git a/lib/libc/string/strstr.c b/lib/libc/string/strstr.c index 1f109611e2a78..aaa648619545e 100644 --- a/lib/libc/string/strstr.c +++ b/lib/libc/string/strstr.c @@ -37,6 +37,10 @@ #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> #include <string.h> diff --git a/lib/libc/string/strtok.c b/lib/libc/string/strtok.c index 1140bfc73ebaf..6af352970484b 100644 --- a/lib/libc/string/strtok.c +++ b/lib/libc/string/strtok.c @@ -41,6 +41,11 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#ifndef lint +static const char rcsid[] = + "$FreeBSD$"; +#endif + #include <stddef.h> #include <string.h> diff --git a/lib/libc/string/strxfrm.c b/lib/libc/string/strxfrm.c index ac172f8bc2080..31922cf412fe5 100644 --- a/lib/libc/string/strxfrm.c +++ b/lib/libc/string/strxfrm.c @@ -23,10 +23,13 @@ * 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. - * - * $FreeBSD$ */ +#ifndef lint +static const char rcsid[] = + "$FreeBSD$"; +#endif + #include <stdlib.h> #include <string.h> #include "collate.h" diff --git a/lib/libc/string/swab.c b/lib/libc/string/swab.c index a4fc3b94097f9..da850868aa799 100644 --- a/lib/libc/string/swab.c +++ b/lib/libc/string/swab.c @@ -37,6 +37,10 @@ #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 <string.h> diff --git a/lib/libc/string/wcscat.c b/lib/libc/string/wcscat.c index 25161d339334f..861822bb092e4 100644 --- a/lib/libc/string/wcscat.c +++ b/lib/libc/string/wcscat.c @@ -1,4 +1,3 @@ -/* $NetBSD: wcscat.c,v 1.1 2000/12/23 23:14:36 itojun Exp $ */ /*- * Copyright (c)1999 Citrus Project, * All rights reserved. @@ -25,14 +24,16 @@ * SUCH DAMAGE. * * citrus Id: wcscat.c,v 1.1 1999/12/29 21:47:45 tshiozak Exp - * - * $FreeBSD$ */ #include <sys/cdefs.h> #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 #include <assert.h> #include <wchar.h> diff --git a/lib/libc/string/wcschr.c b/lib/libc/string/wcschr.c index 9c253dc5ed19f..6eebfbacf63a0 100644 --- a/lib/libc/string/wcschr.c +++ b/lib/libc/string/wcschr.c @@ -1,5 +1,3 @@ -/* $NetBSD: wcschr.c,v 1.1 2000/12/23 23:14:36 itojun Exp $ */ - /*- * Copyright (c)1999 Citrus Project, * All rights reserved. @@ -26,14 +24,16 @@ * SUCH DAMAGE. * * citrus Id: wcschr.c,v 1.2 2000/12/21 05:07:25 itojun Exp - * - * $FreeBSD$ */ #include <sys/cdefs.h> #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 #include <assert.h> #include <wchar.h> diff --git a/lib/libc/string/wcscmp.c b/lib/libc/string/wcscmp.c index d0eb1ee9f72ce..dcf9b57e73570 100644 --- a/lib/libc/string/wcscmp.c +++ b/lib/libc/string/wcscmp.c @@ -1,5 +1,3 @@ -/* $NetBSD$ */ - /*- * Copyright (c) 1990, 1993 * The Regents of the University of California. All rights reserved. @@ -34,8 +32,6 @@ * 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. - * - * $FreeBSD$ */ #include <sys/cdefs.h> @@ -46,6 +42,10 @@ static char sccsid[] = "@(#)strcmp.c 8.1 (Berkeley) 6/4/93"; __RCSID("$NetBSD$"); #endif #endif /* LIBC_SCCS and not lint */ +#ifndef lint +static const char rcsid[] = + "$FreeBSD$"; +#endif #include <assert.h> #include <wchar.h> diff --git a/lib/libc/string/wcscpy.c b/lib/libc/string/wcscpy.c index 6d0b40dbfa20e..d05804af14314 100644 --- a/lib/libc/string/wcscpy.c +++ b/lib/libc/string/wcscpy.c @@ -1,5 +1,3 @@ -/* $NetBSD: wcscpy.c,v 1.1 2000/12/23 23:14:36 itojun Exp $ */ - /*- * Copyright (c)1999 Citrus Project, * All rights reserved. @@ -26,14 +24,16 @@ * SUCH DAMAGE. * * citrus Id: wcscpy.c,v 1.2 2000/12/21 04:51:09 itojun Exp - * - * $FreeBSD$ */ #include <sys/cdefs.h> #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 #include <assert.h> #include <wchar.h> diff --git a/lib/libc/string/wcscspn.c b/lib/libc/string/wcscspn.c index 10a3e80647901..7309574625c81 100644 --- a/lib/libc/string/wcscspn.c +++ b/lib/libc/string/wcscspn.c @@ -1,5 +1,3 @@ -/* $NetBSD: wcscspn.c,v 1.1 2000/12/23 23:14:36 itojun Exp $ */ - /*- * Copyright (c)1999 Citrus Project, * All rights reserved. @@ -26,14 +24,16 @@ * SUCH DAMAGE. * * citrus Id: wcscspn.c,v 1.1 1999/12/29 21:47:45 tshiozak Exp - * - * $FreeBSD$ */ #include <sys/cdefs.h> #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 #include <assert.h> #include <wchar.h> diff --git a/lib/libc/string/wcslcat.c b/lib/libc/string/wcslcat.c index 3145eaf91afe7..3634bfd5be3ac 100644 --- a/lib/libc/string/wcslcat.c +++ b/lib/libc/string/wcslcat.c @@ -1,6 +1,3 @@ -/* $NetBSD: wcslcat.c,v 1.1 2000/12/23 23:14:36 itojun Exp $ */ -/* from OpenBSD: strlcat.c,v 1.3 2000/11/24 11:10:02 itojun Exp */ - /* * Copyright (c) 1998 Todd C. Miller <Todd.Miller@courtesan.com> * All rights reserved. @@ -27,13 +24,17 @@ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD$ + * from OpenBSD: strlcat.c,v 1.3 2000/11/24 11:10:02 itojun Exp */ #include <sys/cdefs.h> #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 #include <sys/types.h> #include <assert.h> diff --git a/lib/libc/string/wcslcpy.c b/lib/libc/string/wcslcpy.c index ff883e045dc01..240feb4b5bd31 100644 --- a/lib/libc/string/wcslcpy.c +++ b/lib/libc/string/wcslcpy.c @@ -1,6 +1,3 @@ -/* $NetBSD: wcslcpy.c,v 1.1 2000/12/23 23:14:36 itojun Exp $ */ -/* from OpenBSD: strlcpy.c,v 1.4 1999/05/01 18:56:41 millert Exp */ - /* * Copyright (c) 1998 Todd C. Miller <Todd.Miller@courtesan.com> * All rights reserved. @@ -27,13 +24,17 @@ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD$ + * from OpenBSD: strlcpy.c,v 1.4 1999/05/01 18:56:41 millert Exp */ #include <sys/cdefs.h> #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 #include <sys/types.h> #include <assert.h> diff --git a/lib/libc/string/wcslen.c b/lib/libc/string/wcslen.c index 1e0381791cb39..8e3039510b8bc 100644 --- a/lib/libc/string/wcslen.c +++ b/lib/libc/string/wcslen.c @@ -1,5 +1,3 @@ -/* $NetBSD: wcslen.c,v 1.1 2000/12/23 23:14:36 itojun Exp $ */ - /*- * Copyright (c)1999 Citrus Project, * All rights reserved. @@ -26,14 +24,16 @@ * SUCH DAMAGE. * * citrus Id: wcslen.c,v 1.1 1999/12/29 21:47:45 tshiozak Exp - * - * $FreeBSD$ */ #include <sys/cdefs.h> #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 #include <assert.h> #include <wchar.h> diff --git a/lib/libc/string/wcsncat.c b/lib/libc/string/wcsncat.c index a0410df5b662f..8d98bdb442932 100644 --- a/lib/libc/string/wcsncat.c +++ b/lib/libc/string/wcsncat.c @@ -1,5 +1,3 @@ -/* $NetBSD: wcsncat.c,v 1.1 2000/12/23 23:14:36 itojun Exp $ */ - /*- * Copyright (c)1999 Citrus Project, * All rights reserved. @@ -26,14 +24,16 @@ * SUCH DAMAGE. * * citrus Id: wcsncat.c,v 1.1 1999/12/29 21:47:45 tshiozak Exp - * - * $FreeBSD$ */ #include <sys/cdefs.h> #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 #include <assert.h> #include <wchar.h> diff --git a/lib/libc/string/wcsncmp.c b/lib/libc/string/wcsncmp.c index 0b406afd23005..bc1abe7ecbbf3 100644 --- a/lib/libc/string/wcsncmp.c +++ b/lib/libc/string/wcsncmp.c @@ -1,5 +1,3 @@ -/* $NetBSD$ */ - /* * Copyright (c) 1989, 1993 * The Regents of the University of California. All rights reserved. @@ -31,8 +29,6 @@ * 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. - * - * $FreeBSD$ */ #include <sys/cdefs.h> @@ -43,6 +39,10 @@ static char sccsid[] = "@(#)strncmp.c 8.1 (Berkeley) 6/4/93"; __RCSID("$NetBSD$"); #endif #endif /* LIBC_SCCS and not lint */ +#ifndef lint +static const char rcsid[] = + "$FreeBSD$"; +#endif #include <assert.h> #include <wchar.h> diff --git a/lib/libc/string/wcsncpy.c b/lib/libc/string/wcsncpy.c index b1846282a7afa..907344b56771b 100644 --- a/lib/libc/string/wcsncpy.c +++ b/lib/libc/string/wcsncpy.c @@ -1,5 +1,3 @@ -/* $NetBSD: wcsncpy.c,v 1.1 2000/12/23 23:14:36 itojun Exp $ */ - /*- * Copyright (c)1999 Citrus Project, * All rights reserved. @@ -26,14 +24,16 @@ * SUCH DAMAGE. * * citrus Id: wcsncpy.c,v 1.1 1999/12/29 21:47:45 tshiozak Exp - * - * $FreeBSD$ */ #include <sys/cdefs.h> #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 #include <assert.h> #include <wchar.h> diff --git a/lib/libc/string/wcspbrk.c b/lib/libc/string/wcspbrk.c index 8c3e06652953c..2808ed25a278d 100644 --- a/lib/libc/string/wcspbrk.c +++ b/lib/libc/string/wcspbrk.c @@ -1,5 +1,3 @@ -/* $NetBSD: wcspbrk.c,v 1.1 2000/12/23 23:14:37 itojun Exp $ */ - /*- * Copyright (c)1999 Citrus Project, * All rights reserved. @@ -26,14 +24,16 @@ * SUCH DAMAGE. * * citrus Id: wcspbrk.c,v 1.2 2000/12/21 05:07:25 itojun Exp - * - * $FreeBSD$ */ #include <sys/cdefs.h> #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 #include <assert.h> #include <wchar.h> diff --git a/lib/libc/string/wcsrchr.c b/lib/libc/string/wcsrchr.c index 5b3d789655d51..4dc9b4bf7bb30 100644 --- a/lib/libc/string/wcsrchr.c +++ b/lib/libc/string/wcsrchr.c @@ -1,5 +1,3 @@ -/* $NetBSD: wcsrchr.c,v 1.1 2000/12/23 23:14:37 itojun Exp $ */ - /*- * Copyright (c)1999 Citrus Project, * All rights reserved. @@ -26,14 +24,16 @@ * SUCH DAMAGE. * * citrus Id: wcsrchr.c,v 1.2 2000/12/21 05:07:25 itojun Exp - * - * $FreeBSD$ */ #include <sys/cdefs.h> #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 #include <assert.h> #include <wchar.h> diff --git a/lib/libc/string/wcsspn.c b/lib/libc/string/wcsspn.c index 2f91f60668efc..40b583b3eb551 100644 --- a/lib/libc/string/wcsspn.c +++ b/lib/libc/string/wcsspn.c @@ -1,5 +1,3 @@ -/* $NetBSD: wcsspn.c,v 1.1 2000/12/23 23:14:37 itojun Exp $ */ - /*- * Copyright (c)1999 Citrus Project, * All rights reserved. @@ -26,14 +24,16 @@ * SUCH DAMAGE. * * citrus Id: wcsspn.c,v 1.1 1999/12/29 21:47:45 tshiozak Exp - * - * $FreeBSD$ */ #include <sys/cdefs.h> #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 #include <assert.h> #include <wchar.h> diff --git a/lib/libc/string/wcsstr.c b/lib/libc/string/wcsstr.c index f6eb89df92cb4..1e4cf215ba69f 100644 --- a/lib/libc/string/wcsstr.c +++ b/lib/libc/string/wcsstr.c @@ -1,5 +1,3 @@ -/* $NetBSD: wcsstr.c,v 1.1 2000/12/23 23:14:37 itojun Exp $ */ - /*- * Copyright (c)1999 Citrus Project, * All rights reserved. @@ -26,14 +24,16 @@ * SUCH DAMAGE. * * citrus Id: wcsstr.c,v 1.2 2000/12/21 05:07:25 itojun Exp - * - * $FreeBSD$ */ #include <sys/cdefs.h> #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 #include <assert.h> #include <wchar.h> diff --git a/lib/libc/string/wcswidth.c b/lib/libc/string/wcswidth.c index ed3eb9dbef407..3ad70c1422a8f 100644 --- a/lib/libc/string/wcswidth.c +++ b/lib/libc/string/wcswidth.c @@ -1,5 +1,3 @@ -/* $NetBSD: wcswidth.c,v 1.1 2000/12/23 23:14:37 itojun Exp $ */ - /*- * Copyright (c)1999 Citrus Project, * All rights reserved. @@ -26,14 +24,16 @@ * SUCH DAMAGE. * * citrus Id: wcswidth.c,v 1.1 1999/12/29 21:47:45 tshiozak Exp - * - * $FreeBSD$ */ #include <sys/cdefs.h> #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 #include <assert.h> #include <wchar.h> diff --git a/lib/libc/string/wmemchr.c b/lib/libc/string/wmemchr.c index 80add2aa723d9..fa49a7485776f 100644 --- a/lib/libc/string/wmemchr.c +++ b/lib/libc/string/wmemchr.c @@ -1,5 +1,3 @@ -/* $NetBSD: wmemchr.c,v 1.1 2000/12/23 23:14:37 itojun Exp $ */ - /*- * Copyright (c)1999 Citrus Project, * All rights reserved. @@ -26,14 +24,16 @@ * SUCH DAMAGE. * * citrus Id: wmemchr.c,v 1.2 2000/12/20 14:08:31 itojun Exp - * - * $FreeBSD$ */ #include <sys/cdefs.h> #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 #include <assert.h> #include <wchar.h> diff --git a/lib/libc/string/wmemcmp.c b/lib/libc/string/wmemcmp.c index 1ce39467c5c56..158bf09a202e8 100644 --- a/lib/libc/string/wmemcmp.c +++ b/lib/libc/string/wmemcmp.c @@ -1,5 +1,3 @@ -/* $NetBSD: wmemcmp.c,v 1.1 2000/12/23 23:14:37 itojun Exp $ */ - /*- * Copyright (c)1999 Citrus Project, * All rights reserved. @@ -26,14 +24,16 @@ * SUCH DAMAGE. * * citrus Id: wmemcmp.c,v 1.2 2000/12/20 14:08:31 itojun Exp - * - * $FreeBSD$ */ #include <sys/cdefs.h> #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 #include <assert.h> #include <wchar.h> diff --git a/lib/libc/string/wmemcpy.c b/lib/libc/string/wmemcpy.c index af2ae990765ae..bb8d05858501d 100644 --- a/lib/libc/string/wmemcpy.c +++ b/lib/libc/string/wmemcpy.c @@ -1,5 +1,3 @@ -/* $NetBSD: wmemcpy.c,v 1.1 2000/12/23 23:14:37 itojun Exp $ */ - /*- * Copyright (c)1999 Citrus Project, * All rights reserved. @@ -26,14 +24,16 @@ * SUCH DAMAGE. * * citrus Id: wmemcpy.c,v 1.2 2000/12/20 14:08:31 itojun Exp - * - * $FreeBSD$ */ #include <sys/cdefs.h> #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 #include <assert.h> #include <string.h> diff --git a/lib/libc/string/wmemmove.c b/lib/libc/string/wmemmove.c index 2b9e2752f1625..edf8d1d8290cd 100644 --- a/lib/libc/string/wmemmove.c +++ b/lib/libc/string/wmemmove.c @@ -1,5 +1,3 @@ -/* $NetBSD: wmemmove.c,v 1.1 2000/12/23 23:14:37 itojun Exp $ */ - /*- * Copyright (c)1999 Citrus Project, * All rights reserved. @@ -26,14 +24,16 @@ * SUCH DAMAGE. * * citrus Id: wmemmove.c,v 1.2 2000/12/20 14:08:31 itojun Exp - * - * $FreeBSD$ */ #include <sys/cdefs.h> #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 #include <assert.h> #include <string.h> diff --git a/lib/libc/string/wmemset.c b/lib/libc/string/wmemset.c index c4563859f001f..08ce087b29311 100644 --- a/lib/libc/string/wmemset.c +++ b/lib/libc/string/wmemset.c @@ -1,5 +1,3 @@ -/* $NetBSD: wmemset.c,v 1.1 2000/12/23 23:14:37 itojun Exp $ */ - /*- * Copyright (c)1999 Citrus Project, * All rights reserved. @@ -26,14 +24,16 @@ * SUCH DAMAGE. * * citrus Id: wmemset.c,v 1.2 2000/12/20 14:08:31 itojun Exp - * - * $FreeBSD$ */ #include <sys/cdefs.h> #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 #include <assert.h> #include <wchar.h> diff --git a/sys/libkern/strlcat.c b/sys/libkern/strlcat.c index 5bc2c91b9baa7..c325ef332f3de 100644 --- a/sys/libkern/strlcat.c +++ b/sys/libkern/strlcat.c @@ -25,13 +25,15 @@ * 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. - * - * $FreeBSD$ */ #if defined(LIBC_SCCS) && !defined(lint) 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/types.h> #include <string.h> diff --git a/sys/libkern/strlcpy.c b/sys/libkern/strlcpy.c index 300a28bc3911f..fde5ff5182dff 100644 --- a/sys/libkern/strlcpy.c +++ b/sys/libkern/strlcpy.c @@ -28,8 +28,14 @@ */ #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 #endif /* LIBC_SCCS and not lint */ +#ifndef lint +static const char rcsid[] = + "$FreeBSD$"; +#endif #include <sys/types.h> #include <string.h> diff --git a/sys/libkern/strsep.c b/sys/libkern/strsep.c index ddad5964ce193..485f65140c056 100644 --- a/sys/libkern/strsep.c +++ b/sys/libkern/strsep.c @@ -38,6 +38,10 @@ #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 /* * Get next token from string *stringp, where tokens are possibly-empty |