From 90a2e082b97f0f1e0a87e03e5667330614818729 Mon Sep 17 00:00:00 2001 From: obrien Date: Sun, 4 May 2003 02:54:49 +0000 Subject: [PATCH] Use __FBSDID vs. rcsid[]. Also protect sccs[] and copyright[] from GCC 3.3. git-svn-id: http://svn0.us-east.freebsd.org/base/head/contrib/telnet@114630 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f --- libtelnet/auth.c | 10 +++++----- libtelnet/enc_des.c | 10 ++++------ telnet/authenc.c | 8 ++++---- telnet/commands.c | 8 ++++---- telnet/main.c | 8 ++++---- telnet/network.c | 8 ++++---- telnet/ring.c | 8 ++++---- telnet/sys_bsd.c | 12 ++++++------ telnet/telnet.c | 8 ++++---- telnet/terminal.c | 8 ++++---- telnet/utilities.c | 8 ++++---- telnetd/authenc.c | 8 ++++---- telnetd/global.c | 8 ++++---- telnetd/slc.c | 8 ++++---- telnetd/state.c | 8 ++++---- telnetd/sys_term.c | 8 ++++---- telnetd/telnetd.c | 8 ++++---- telnetd/termstat.c | 8 ++++---- telnetd/utility.c | 8 ++++---- 19 files changed, 79 insertions(+), 81 deletions(-) diff --git a/libtelnet/auth.c b/libtelnet/auth.c index 1f61c3e..4642655 100644 --- a/libtelnet/auth.c +++ b/libtelnet/auth.c @@ -30,16 +30,16 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD$ */ -#include - -__FBSDID("$FreeBSD$"); - +#if 0 #ifndef lint static const char sccsid[] = "@(#)auth.c 8.3 (Berkeley) 5/30/95"; #endif /* not lint */ +#endif +#include +__FBSDID("$FreeBSD$"); + /* * Copyright (C) 1990 by the Massachusetts Institute of Technology diff --git a/libtelnet/enc_des.c b/libtelnet/enc_des.c index cb70b57..2f7fe6e 100644 --- a/libtelnet/enc_des.c +++ b/libtelnet/enc_des.c @@ -29,17 +29,15 @@ * 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 - -__FBSDID("$FreeBSD$"); - +#if 0 #ifndef lint static const char sccsid[] = "@(#)enc_des.c 8.3 (Berkeley) 5/30/95"; #endif /* not lint */ +#endif +#include +__FBSDID("$FreeBSD$"); #ifdef ENCRYPTION # ifdef AUTHENTICATION diff --git a/telnet/authenc.c b/telnet/authenc.c index 718ab84..85f389b 100644 --- a/telnet/authenc.c +++ b/telnet/authenc.c @@ -31,13 +31,13 @@ * SUCH DAMAGE. */ -#include - -__FBSDID("$FreeBSD$"); - +#if 0 #ifndef lint static const char sccsid[] = "@(#)authenc.c 8.1 (Berkeley) 6/6/93"; #endif +#endif +#include +__FBSDID("$FreeBSD$"); #ifdef AUTHENTICATION #ifdef ENCRYPTION diff --git a/telnet/commands.c b/telnet/commands.c index c450f43..3221699 100644 --- a/telnet/commands.c +++ b/telnet/commands.c @@ -31,13 +31,13 @@ * SUCH DAMAGE. */ -#include - -__FBSDID("$FreeBSD$"); - +#if 0 #ifndef lint static const char sccsid[] = "@(#)commands.c 8.4 (Berkeley) 5/30/95"; #endif +#endif +#include +__FBSDID("$FreeBSD$"); #include #include diff --git a/telnet/main.c b/telnet/main.c index 1e973b4..de7e60c 100644 --- a/telnet/main.c +++ b/telnet/main.c @@ -31,13 +31,13 @@ * SUCH DAMAGE. */ -#include - -__FBSDID("$FreeBSD$"); - +#if 0 #ifndef lint static const char sccsid[] = "@(#)main.c 8.3 (Berkeley) 5/30/95"; #endif +#endif +#include +__FBSDID("$FreeBSD$"); #include #include diff --git a/telnet/network.c b/telnet/network.c index 889b1b8..bb75d63 100644 --- a/telnet/network.c +++ b/telnet/network.c @@ -31,13 +31,13 @@ * SUCH DAMAGE. */ -#include - -__FBSDID("$FreeBSD$"); - +#if 0 #ifndef lint static const char sccsid[] = "@(#)network.c 8.2 (Berkeley) 12/15/93"; #endif +#endif +#include +__FBSDID("$FreeBSD$"); #include #include diff --git a/telnet/ring.c b/telnet/ring.c index 8fd14a7..6c2b7ef 100644 --- a/telnet/ring.c +++ b/telnet/ring.c @@ -31,13 +31,13 @@ * SUCH DAMAGE. */ -#include - -__FBSDID("$FreeBSD$"); - +#if 0 #ifndef lint static const char sccsid[] = "@(#)ring.c 8.2 (Berkeley) 5/30/95"; #endif +#endif +#include +__FBSDID("$FreeBSD$"); /* * This defines a structure for a ring buffer. diff --git a/telnet/sys_bsd.c b/telnet/sys_bsd.c index 5d931bf..45ef1e2 100644 --- a/telnet/sys_bsd.c +++ b/telnet/sys_bsd.c @@ -31,15 +31,13 @@ * SUCH DAMAGE. */ -#include -#include -#include - -__FBSDID("$FreeBSD$"); - +#if 0 #ifndef lint static const char sccsid[] = "@(#)sys_bsd.c 8.4 (Berkeley) 5/30/95"; #endif +#endif +#include +__FBSDID("$FreeBSD$"); /* * The following routines try to encapsulate what is system dependent @@ -49,9 +47,11 @@ static const char sccsid[] = "@(#)sys_bsd.c 8.4 (Berkeley) 5/30/95"; #include #include #include +#include #include #include #include +#include #include #include diff --git a/telnet/telnet.c b/telnet/telnet.c index ab0faf4..2e29989 100644 --- a/telnet/telnet.c +++ b/telnet/telnet.c @@ -31,13 +31,13 @@ * SUCH DAMAGE. */ -#include - -__FBSDID("$FreeBSD$"); - +#if 0 #ifndef lint static const char sccsid[] = "@(#)telnet.c 8.4 (Berkeley) 5/30/95"; #endif +#endif +#include +__FBSDID("$FreeBSD$"); #include diff --git a/telnet/terminal.c b/telnet/terminal.c index 0244cac..3dda1c5 100644 --- a/telnet/terminal.c +++ b/telnet/terminal.c @@ -31,13 +31,13 @@ * SUCH DAMAGE. */ -#include - -__FBSDID("$FreeBSD$"); - +#if 0 #ifndef lint static const char sccsid[] = "@(#)terminal.c 8.2 (Berkeley) 2/16/95"; #endif +#endif +#include +__FBSDID("$FreeBSD$"); #include #include diff --git a/telnet/utilities.c b/telnet/utilities.c index b78d281..b0cfe37 100644 --- a/telnet/utilities.c +++ b/telnet/utilities.c @@ -31,13 +31,13 @@ * SUCH DAMAGE. */ -#include - -__FBSDID("$FreeBSD$"); - +#if 0 #ifndef lint static const char sccsid[] = "@(#)utilities.c 8.3 (Berkeley) 5/30/95"; #endif +#endif +#include +__FBSDID("$FreeBSD$"); #define TELOPTS #define TELCMDS diff --git a/telnetd/authenc.c b/telnetd/authenc.c index fd5f585..9377b52 100644 --- a/telnetd/authenc.c +++ b/telnetd/authenc.c @@ -31,13 +31,13 @@ * SUCH DAMAGE. */ -#include - -__FBSDID("$FreeBSD$"); - +#if 0 #ifndef lint static const char sccsid[] = "@(#)authenc.c 8.2 (Berkeley) 5/30/95"; #endif +#endif +#include +__FBSDID("$FreeBSD$"); #ifdef AUTHENTICATION #ifdef ENCRYPTION diff --git a/telnetd/global.c b/telnetd/global.c index 0cf95db..2ed82d0 100644 --- a/telnetd/global.c +++ b/telnetd/global.c @@ -31,13 +31,13 @@ * SUCH DAMAGE. */ -#ifndef lint #if 0 +#ifndef lint static const char sccsid[] = "@(#)global.c 8.1 (Berkeley) 6/4/93"; -#endif -static const char rcsid[] = - "$FreeBSD$"; #endif /* not lint */ +#endif +#include +__FBSDID("$FreeBSD$"); /* * Allocate global variables. We do this diff --git a/telnetd/slc.c b/telnetd/slc.c index d4eee1a..ad03441 100644 --- a/telnetd/slc.c +++ b/telnetd/slc.c @@ -31,13 +31,13 @@ * SUCH DAMAGE. */ -#include - -__FBSDID("$FreeBSD$"); - +#if 0 #ifndef lint static const char sccsid[] = "@(#)slc.c 8.2 (Berkeley) 5/30/95"; #endif +#endif +#include +__FBSDID("$FreeBSD$"); #include "telnetd.h" diff --git a/telnetd/state.c b/telnetd/state.c index 93de48e..9db4516 100644 --- a/telnetd/state.c +++ b/telnetd/state.c @@ -31,13 +31,13 @@ * SUCH DAMAGE. */ -#include - -__FBSDID("$FreeBSD$"); - +#if 0 #ifndef lint static const char sccsid[] = "@(#)state.c 8.5 (Berkeley) 5/30/95"; #endif +#endif +#include +__FBSDID("$FreeBSD$"); #include #include "telnetd.h" diff --git a/telnetd/sys_term.c b/telnetd/sys_term.c index 1e832e3..151c5b4 100644 --- a/telnetd/sys_term.c +++ b/telnetd/sys_term.c @@ -31,13 +31,13 @@ * SUCH DAMAGE. */ -#include - -__FBSDID("$FreeBSD$"); - +#if 0 #ifndef lint static const char sccsid[] = "@(#)sys_term.c 8.4+1 (Berkeley) 5/30/95"; #endif +#endif +#include +__FBSDID("$FreeBSD$"); #include #include diff --git a/telnetd/telnetd.c b/telnetd/telnetd.c index 02f21cf..6a5a623 100644 --- a/telnetd/telnetd.c +++ b/telnetd/telnetd.c @@ -31,13 +31,13 @@ * SUCH DAMAGE. */ -#include - -__FBSDID("$FreeBSD$"); - +#if 0 #ifndef lint static const char sccsid[] = "@(#)telnetd.c 8.4 (Berkeley) 5/30/95"; #endif +#endif +#include +__FBSDID("$FreeBSD$"); #include "telnetd.h" #include "pathnames.h" diff --git a/telnetd/termstat.c b/telnetd/termstat.c index c7dc845..36f5997 100644 --- a/telnetd/termstat.c +++ b/telnetd/termstat.c @@ -31,13 +31,13 @@ * SUCH DAMAGE. */ -#include - -__FBSDID("$FreeBSD$"); - +#if 0 #ifndef lint static const char sccsid[] = "@(#)termstat.c 8.2 (Berkeley) 5/30/95"; #endif +#endif +#include +__FBSDID("$FreeBSD$"); #include "telnetd.h" diff --git a/telnetd/utility.c b/telnetd/utility.c index 4bbbfb8..54e2327 100644 --- a/telnetd/utility.c +++ b/telnetd/utility.c @@ -31,13 +31,13 @@ * SUCH DAMAGE. */ -#ifndef lint #if 0 +#ifndef lint static const char sccsid[] = "@(#)utility.c 8.4 (Berkeley) 5/30/95"; -#endif -static const char rcsid[] = - "$FreeBSD$"; #endif /* not lint */ +#endif +#include +__FBSDID("$FreeBSD$"); #ifdef __FreeBSD__ #include