From 09a80d4867b85b3df9856d150eb565232dc900d4 Mon Sep 17 00:00:00 2001 From: "David E. O'Brien" Date: Thu, 1 May 2003 16:58:57 +0000 Subject: [PATCH] Quiet warnings about copyright[]. --- bin/chio/chio.c | 2 ++ bin/chmod/chmod.c | 4 ++-- bin/cp/cp.c | 4 ++-- bin/dd/dd.c | 4 ++-- bin/df/df.c | 4 ++-- bin/domainname/domainname.c | 4 ++-- bin/echo/echo.c | 4 ++-- bin/ed/main.c | 2 ++ bin/hostname/hostname.c | 4 ++-- bin/kill/kill.c | 4 ++-- bin/ln/ln.c | 4 ++-- bin/mkdir/mkdir.c | 4 ++-- bin/mv/mv.c | 4 ++-- bin/pwd/pwd.c | 4 ++-- bin/rcp/rcp.c | 3 +-- bin/rm/rm.c | 4 ++-- bin/rmdir/rmdir.c | 4 ++-- bin/sh/arith.y | 4 ++-- bin/sh/arith_lex.l | 4 ++-- bin/sh/mknodes.c | 4 ++-- bin/sh/mksyntax.c | 4 ++-- bin/sleep/sleep.c | 4 ++-- bin/stty/stty.c | 4 ++-- bin/sync/sync.c | 4 ++-- 24 files changed, 47 insertions(+), 44 deletions(-) diff --git a/bin/chio/chio.c b/bin/chio/chio.c index b0f160f17e15..02cb32f3c9b3 100644 --- a/bin/chio/chio.c +++ b/bin/chio/chio.c @@ -35,10 +35,12 @@ * Addidional Copyright (c) 2000, by C. Stephen Gunn, Waterspout Communications */ +#if 0 #ifndef lint static const char copyright[] = "@(#) Copyright (c) 1996 Jason R. Thorpe. All rights reserved."; #endif /* not lint */ +#endif #include __FBSDID("$FreeBSD$"); diff --git a/bin/chmod/chmod.c b/bin/chmod/chmod.c index c90c7b38261a..507a62621e50 100644 --- a/bin/chmod/chmod.c +++ b/bin/chmod/chmod.c @@ -31,6 +31,7 @@ * SUCH DAMAGE. */ +#if 0 #ifndef lint static char const copyright[] = "@(#) Copyright (c) 1989, 1993, 1994\n\ @@ -38,10 +39,9 @@ static char const copyright[] = #endif /* not lint */ #ifndef lint -#if 0 static char sccsid[] = "@(#)chmod.c 8.8 (Berkeley) 4/1/94"; -#endif #endif /* not lint */ +#endif #include __FBSDID("$FreeBSD$"); diff --git a/bin/cp/cp.c b/bin/cp/cp.c index 81c1acbdd747..3c3c2236f46a 100644 --- a/bin/cp/cp.c +++ b/bin/cp/cp.c @@ -34,6 +34,7 @@ * SUCH DAMAGE. */ +#if 0 #ifndef lint static char const copyright[] = "@(#) Copyright (c) 1988, 1993, 1994\n\ @@ -41,10 +42,9 @@ static char const copyright[] = #endif /* not lint */ #ifndef lint -#if 0 static char sccsid[] = "@(#)cp.c 8.2 (Berkeley) 4/1/94"; -#endif #endif /* not lint */ +#endif #include __FBSDID("$FreeBSD$"); diff --git a/bin/dd/dd.c b/bin/dd/dd.c index 92274f253e5a..9deac8a21a68 100644 --- a/bin/dd/dd.c +++ b/bin/dd/dd.c @@ -35,6 +35,7 @@ * SUCH DAMAGE. */ +#if 0 #ifndef lint static char const copyright[] = "@(#) Copyright (c) 1991, 1993, 1994\n\ @@ -42,10 +43,9 @@ static char const copyright[] = #endif /* not lint */ #ifndef lint -#if 0 static char sccsid[] = "@(#)dd.c 8.5 (Berkeley) 4/2/94"; -#endif #endif /* not lint */ +#endif #include __FBSDID("$FreeBSD$"); diff --git a/bin/df/df.c b/bin/df/df.c index 58a23204a270..eba0e81e828d 100644 --- a/bin/df/df.c +++ b/bin/df/df.c @@ -36,6 +36,7 @@ * SUCH DAMAGE. */ +#if 0 #ifndef lint static const char copyright[] = "@(#) Copyright (c) 1980, 1990, 1993, 1994\n\ @@ -43,10 +44,9 @@ static const char copyright[] = #endif /* not lint */ #ifndef lint -#if 0 static char sccsid[] = "@(#)df.c 8.9 (Berkeley) 5/8/95"; -#endif #endif /* not lint */ +#endif #include __FBSDID("$FreeBSD$"); diff --git a/bin/domainname/domainname.c b/bin/domainname/domainname.c index 741874903876..5da1cd24d37a 100644 --- a/bin/domainname/domainname.c +++ b/bin/domainname/domainname.c @@ -31,6 +31,7 @@ * SUCH DAMAGE. */ +#if 0 #ifndef lint static char const copyright[] = "@(#) Copyright (c) 1988, 1993\n\ @@ -38,10 +39,9 @@ static char const copyright[] = #endif /* not lint */ #ifndef lint -#if 0 static char const sccsid[] = "From: @(#)hostname.c 8.1 (Berkeley) 5/31/93"; -#endif #endif /* not lint */ +#endif #include __FBSDID("$FreeBSD$"); diff --git a/bin/echo/echo.c b/bin/echo/echo.c index b4aeb62ee131..85a9efaafd7f 100644 --- a/bin/echo/echo.c +++ b/bin/echo/echo.c @@ -31,6 +31,7 @@ * SUCH DAMAGE. */ +#if 0 #ifndef lint static char const copyright[] = "@(#) Copyright (c) 1989, 1993\n\ @@ -38,10 +39,9 @@ static char const copyright[] = #endif /* not lint */ #ifndef lint -#if 0 static char sccsid[] = "@(#)echo.c 8.1 (Berkeley) 5/31/93"; -#endif #endif /* not lint */ +#endif #include __FBSDID("$FreeBSD$"); diff --git a/bin/ed/main.c b/bin/ed/main.c index 2cebaf89d2c5..bea272494ad0 100644 --- a/bin/ed/main.c +++ b/bin/ed/main.c @@ -27,9 +27,11 @@ */ #ifndef lint +#if 0 static const char copyright[] = "@(#) Copyright (c) 1993 Andrew Moore, Talke Studio. \n\ All rights reserved.\n"; +#endif #endif /* not lint */ #include diff --git a/bin/hostname/hostname.c b/bin/hostname/hostname.c index ada7b43959db..583812dafaa0 100644 --- a/bin/hostname/hostname.c +++ b/bin/hostname/hostname.c @@ -31,6 +31,7 @@ * SUCH DAMAGE. */ +#if 0 #ifndef lint static char const copyright[] = "@(#) Copyright (c) 1988, 1993\n\ @@ -38,10 +39,9 @@ static char const copyright[] = #endif /* not lint */ #ifndef lint -#if 0 static char sccsid[] = "@(#)hostname.c 8.1 (Berkeley) 5/31/93"; -#endif #endif /* not lint */ +#endif #include __FBSDID("$FreeBSD$"); diff --git a/bin/kill/kill.c b/bin/kill/kill.c index b170d3576a34..120dc8797a9c 100644 --- a/bin/kill/kill.c +++ b/bin/kill/kill.c @@ -31,6 +31,7 @@ * SUCH DAMAGE. */ +#if 0 #ifndef lint static char const copyright[] = "@(#) Copyright (c) 1988, 1993, 1994\n\ @@ -38,10 +39,9 @@ static char const copyright[] = #endif /* not lint */ #ifndef lint -#if 0 static char sccsid[] = "@(#)kill.c 8.4 (Berkeley) 4/28/95"; -#endif #endif /* not lint */ +#endif #include __FBSDID("$FreeBSD$"); diff --git a/bin/ln/ln.c b/bin/ln/ln.c index 19d57c6626f7..f27f25185af6 100644 --- a/bin/ln/ln.c +++ b/bin/ln/ln.c @@ -31,6 +31,7 @@ * SUCH DAMAGE. */ +#if 0 #ifndef lint static char const copyright[] = "@(#) Copyright (c) 1987, 1993, 1994\n\ @@ -38,10 +39,9 @@ static char const copyright[] = #endif /* not lint */ #ifndef lint -#if 0 static char sccsid[] = "@(#)ln.c 8.2 (Berkeley) 3/31/94"; -#endif #endif /* not lint */ +#endif #include __FBSDID("$FreeBSD$"); diff --git a/bin/mkdir/mkdir.c b/bin/mkdir/mkdir.c index 2a0f05b46cf9..c40f5ae01729 100644 --- a/bin/mkdir/mkdir.c +++ b/bin/mkdir/mkdir.c @@ -31,6 +31,7 @@ * SUCH DAMAGE. */ +#if 0 #ifndef lint static char const copyright[] = "@(#) Copyright (c) 1983, 1992, 1993\n\ @@ -38,10 +39,9 @@ static char const copyright[] = #endif /* not lint */ #ifndef lint -#if 0 static char sccsid[] = "@(#)mkdir.c 8.2 (Berkeley) 1/25/94"; -#endif #endif /* not lint */ +#endif #include __FBSDID("$FreeBSD$"); diff --git a/bin/mv/mv.c b/bin/mv/mv.c index 3f91ca0396e5..70b92d4d9b80 100644 --- a/bin/mv/mv.c +++ b/bin/mv/mv.c @@ -34,6 +34,7 @@ * SUCH DAMAGE. */ +#if 0 #ifndef lint static char const copyright[] = "@(#) Copyright (c) 1989, 1993, 1994\n\ @@ -41,10 +42,9 @@ static char const copyright[] = #endif /* not lint */ #ifndef lint -#if 0 static char sccsid[] = "@(#)mv.c 8.2 (Berkeley) 4/2/94"; -#endif #endif /* not lint */ +#endif #include __FBSDID("$FreeBSD$"); diff --git a/bin/pwd/pwd.c b/bin/pwd/pwd.c index 6d517924eefb..8eedc0b861e0 100644 --- a/bin/pwd/pwd.c +++ b/bin/pwd/pwd.c @@ -31,6 +31,7 @@ * SUCH DAMAGE. */ +#if 0 #ifndef lint static char const copyright[] = "@(#) Copyright (c) 1991, 1993, 1994\n\ @@ -38,10 +39,9 @@ static char const copyright[] = #endif /* not lint */ #ifndef lint -#if 0 static char sccsid[] = "@(#)pwd.c 8.3 (Berkeley) 4/1/94"; -#endif #endif /* not lint */ +#endif #include __FBSDID("$FreeBSD$"); diff --git a/bin/rcp/rcp.c b/bin/rcp/rcp.c index d7262b49517f..ca21062ecb16 100644 --- a/bin/rcp/rcp.c +++ b/bin/rcp/rcp.c @@ -38,18 +38,17 @@ * SUCH DAMAGE. */ +#if 0 #ifndef lint static char const copyright[] = "@(#) Copyright (c) 1983, 1990, 1992, 1993\n\ The Regents of the University of California. All rights reserved.\n"; #endif /* not lint */ -#if 0 #ifndef lint static char sccsid[] = "@(#)rcp.c 8.2 (Berkeley) 4/2/94"; #endif /* not lint */ #endif - #include __FBSDID("$FreeBSD$"); diff --git a/bin/rm/rm.c b/bin/rm/rm.c index 6175277d476c..ea65d3b49891 100644 --- a/bin/rm/rm.c +++ b/bin/rm/rm.c @@ -31,6 +31,7 @@ * SUCH DAMAGE. */ +#if 0 #ifndef lint static const char copyright[] = "@(#) Copyright (c) 1990, 1993, 1994\n\ @@ -38,10 +39,9 @@ static const char copyright[] = #endif /* not lint */ #ifndef lint -#if 0 static char sccsid[] = "@(#)rm.c 8.5 (Berkeley) 4/18/94"; -#endif #endif /* not lint */ +#endif #include __FBSDID("$FreeBSD$"); diff --git a/bin/rmdir/rmdir.c b/bin/rmdir/rmdir.c index f869c3f20f4a..606cf7e34f24 100644 --- a/bin/rmdir/rmdir.c +++ b/bin/rmdir/rmdir.c @@ -31,6 +31,7 @@ * SUCH DAMAGE. */ +#if 0 #ifndef lint static char const copyright[] = "@(#) Copyright (c) 1992, 1993, 1994\n\ @@ -38,10 +39,9 @@ static char const copyright[] = #endif /* not lint */ #ifndef lint -#if 0 static char sccsid[] = "@(#)rmdir.c 8.3 (Berkeley) 4/2/94"; -#endif #endif /* not lint */ +#endif #include __FBSDID("$FreeBSD$"); diff --git a/bin/sh/arith.y b/bin/sh/arith.y index 8438e0960bd9..1ced62685d33 100644 --- a/bin/sh/arith.y +++ b/bin/sh/arith.y @@ -93,9 +93,9 @@ expr: ARITH_LPAREN expr ARITH_RPAREN = { $$ = $2; } #if 0 static char sccsid[] = "@(#)arith.y 8.3 (Berkeley) 5/4/95"; #endif -static const char rcsid[] = - "$FreeBSD$"; #endif /* not lint */ +#include +__FBSDID("$FreeBSD$"); #include "shell.h" #include "error.h" diff --git a/bin/sh/arith_lex.l b/bin/sh/arith_lex.l index e1ad222223f4..6bbbfafd425d 100644 --- a/bin/sh/arith_lex.l +++ b/bin/sh/arith_lex.l @@ -39,9 +39,9 @@ #if 0 static char sccsid[] = "@(#)arith_lex.l 8.3 (Berkeley) 5/4/95"; #endif -static const char rcsid[] = - "$FreeBSD$"; #endif /* not lint */ +#include +__FBSDID("$FreeBSD$"); #include "y.tab.h" #include "error.h" diff --git a/bin/sh/mknodes.c b/bin/sh/mknodes.c index 371ca16ddd97..d87179b3c4f5 100644 --- a/bin/sh/mknodes.c +++ b/bin/sh/mknodes.c @@ -34,6 +34,7 @@ * SUCH DAMAGE. */ +#if 0 #ifndef lint static char const copyright[] = "@(#) Copyright (c) 1991, 1993\n\ @@ -41,10 +42,9 @@ static char const copyright[] = #endif /* not lint */ #ifndef lint -#if 0 static char sccsid[] = "@(#)mknodes.c 8.2 (Berkeley) 5/4/95"; -#endif #endif /* not lint */ +#endif #include __FBSDID("$FreeBSD$"); diff --git a/bin/sh/mksyntax.c b/bin/sh/mksyntax.c index c44490e7e0e7..d75b68af8d50 100644 --- a/bin/sh/mksyntax.c +++ b/bin/sh/mksyntax.c @@ -34,6 +34,7 @@ * SUCH DAMAGE. */ +#if 0 #ifndef lint static char const copyright[] = "@(#) Copyright (c) 1991, 1993\n\ @@ -41,10 +42,9 @@ static char const copyright[] = #endif /* not lint */ #ifndef lint -#if 0 static char sccsid[] = "@(#)mksyntax.c 8.2 (Berkeley) 5/4/95"; -#endif #endif /* not lint */ +#endif #include __FBSDID("$FreeBSD$"); diff --git a/bin/sleep/sleep.c b/bin/sleep/sleep.c index 0086ee02b271..89e143611ea0 100644 --- a/bin/sleep/sleep.c +++ b/bin/sleep/sleep.c @@ -31,6 +31,7 @@ * SUCH DAMAGE. */ +#if 0 #ifndef lint static char const copyright[] = "@(#) Copyright (c) 1988, 1993, 1994\n\ @@ -38,10 +39,9 @@ static char const copyright[] = #endif /* not lint */ #ifndef lint -#if 0 static char sccsid[] = "@(#)sleep.c 8.3 (Berkeley) 4/2/94"; -#endif #endif /* not lint */ +#endif #include __FBSDID("$FreeBSD$"); diff --git a/bin/stty/stty.c b/bin/stty/stty.c index 75d05ffe391e..70e36810856b 100644 --- a/bin/stty/stty.c +++ b/bin/stty/stty.c @@ -31,6 +31,7 @@ * SUCH DAMAGE. */ +#if 0 #ifndef lint static char const copyright[] = "@(#) Copyright (c) 1989, 1991, 1993, 1994\n\ @@ -38,10 +39,9 @@ static char const copyright[] = #endif /* not lint */ #ifndef lint -#if 0 static char sccsid[] = "@(#)stty.c 8.3 (Berkeley) 4/2/94"; -#endif #endif /* not lint */ +#endif #include __FBSDID("$FreeBSD$"); diff --git a/bin/sync/sync.c b/bin/sync/sync.c index 42a7abd119d2..6581ba665dbf 100644 --- a/bin/sync/sync.c +++ b/bin/sync/sync.c @@ -31,6 +31,7 @@ * SUCH DAMAGE. */ +#if 0 #ifndef lint static char const copyright[] = "@(#) Copyright (c) 1987, 1993\n\ @@ -38,10 +39,9 @@ static char const copyright[] = #endif /* not lint */ #ifndef lint -#if 0 static char sccsid[] = "@(#)sync.c 8.1 (Berkeley) 5/31/93"; -#endif #endif /* not lint */ +#endif #include __FBSDID("$FreeBSD$");