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
2003-05-04 02:54:49 +00:00 · 2003-05-04 02:54:49 +00:00 · 90a2e082b9
parent a948d8a850
commit 90a2e082b9
19 changed files with 79 additions and 81 deletions
--- 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 <sys/cdefs.h>
-
-__FBSDID("$FreeBSD$");
-
+#if 0
 #ifndef lint
 static const char sccsid[] = "@(#)auth.c	8.3 (Berkeley) 5/30/95";
 #endif /* not lint */
+#endif
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+

 /*
 * Copyright (C) 1990 by the Massachusetts Institute of Technology
--- 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 <sys/cdefs.h>
-
-__FBSDID("$FreeBSD$");
-
+#if 0
 #ifndef lint
 static const char sccsid[] = "@(#)enc_des.c	8.3 (Berkeley) 5/30/95";
 #endif /* not lint */
+#endif
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");

 #ifdef	ENCRYPTION
 # ifdef	AUTHENTICATION
--- a/telnet/authenc.c
+++ b/telnet/authenc.c
@ -31,13 +31,13 @@
 * SUCH DAMAGE.
 */

-#include <sys/cdefs.h>
-
-__FBSDID("$FreeBSD$");
-
+#if 0
 #ifndef lint
 static const char sccsid[] = "@(#)authenc.c	8.1 (Berkeley) 6/6/93";
 #endif
+#endif
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");

 #ifdef	AUTHENTICATION
 #ifdef	ENCRYPTION
--- a/telnet/commands.c
+++ b/telnet/commands.c
@ -31,13 +31,13 @@
 * SUCH DAMAGE.
 */

-#include <sys/cdefs.h>
-
-__FBSDID("$FreeBSD$");
-
+#if 0
 #ifndef lint
 static const char sccsid[] = "@(#)commands.c	8.4 (Berkeley) 5/30/95";
 #endif
+#endif
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");

 #include <sys/param.h>
 #include <sys/un.h>
--- a/telnet/main.c
+++ b/telnet/main.c
@ -31,13 +31,13 @@
 * SUCH DAMAGE.
 */

-#include <sys/cdefs.h>
-
-__FBSDID("$FreeBSD$");
-
+#if 0
 #ifndef lint
 static const char sccsid[] = "@(#)main.c	8.3 (Berkeley) 5/30/95";
 #endif
+#endif
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");

 #include <sys/types.h>
 #include <sys/socket.h>
--- a/telnet/network.c
+++ b/telnet/network.c
@ -31,13 +31,13 @@
 * SUCH DAMAGE.
 */

-#include <sys/cdefs.h>
-
-__FBSDID("$FreeBSD$");
-
+#if 0
 #ifndef lint
 static const char sccsid[] = "@(#)network.c	8.2 (Berkeley) 12/15/93";
 #endif
+#endif
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");

 #include <sys/types.h>
 #include <sys/socket.h>
--- a/telnet/ring.c
+++ b/telnet/ring.c
@ -31,13 +31,13 @@
 * SUCH DAMAGE.
 */

-#include <sys/cdefs.h>
-
-__FBSDID("$FreeBSD$");
-
+#if 0
 #ifndef lint
 static const char sccsid[] = "@(#)ring.c	8.2 (Berkeley) 5/30/95";
 #endif
+#endif
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");

 /*
 * This defines a structure for a ring buffer.
--- a/telnet/sys_bsd.c
+++ b/telnet/sys_bsd.c
@ -31,15 +31,13 @@
 * SUCH DAMAGE.
 */

-#include <sys/cdefs.h>
-#include <stdlib.h>
-#include <err.h>
-
-__FBSDID("$FreeBSD$");
-
+#if 0
 #ifndef lint
 static const char sccsid[] = "@(#)sys_bsd.c	8.4 (Berkeley) 5/30/95";
 #endif
+#endif
+#include <sys/cdefs.h>
+__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 <sys/param.h>
 #include <sys/socket.h>
 #include <sys/time.h>
+#include <err.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <signal.h>
+#include <stdlib.h>
 #include <unistd.h>
 #include <arpa/telnet.h>

--- a/telnet/telnet.c
+++ b/telnet/telnet.c
@ -31,13 +31,13 @@
 * SUCH DAMAGE.
 */

-#include <sys/cdefs.h>
-
-__FBSDID("$FreeBSD$");
-
+#if 0
 #ifndef lint
 static const char sccsid[] = "@(#)telnet.c	8.4 (Berkeley) 5/30/95";
 #endif
+#endif
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");

 #include <sys/types.h>

--- a/telnet/terminal.c
+++ b/telnet/terminal.c
@ -31,13 +31,13 @@
 * SUCH DAMAGE.
 */

-#include <sys/cdefs.h>
-
-__FBSDID("$FreeBSD$");
-
+#if 0
 #ifndef lint
 static const char sccsid[] = "@(#)terminal.c	8.2 (Berkeley) 2/16/95";
 #endif
+#endif
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");

 #include <arpa/telnet.h>
 #include <sys/types.h>
--- a/telnet/utilities.c
+++ b/telnet/utilities.c
@ -31,13 +31,13 @@
 * SUCH DAMAGE.
 */

-#include <sys/cdefs.h>
-
-__FBSDID("$FreeBSD$");
-
+#if 0
 #ifndef lint
 static const char sccsid[] = "@(#)utilities.c	8.3 (Berkeley) 5/30/95";
 #endif
+#endif
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");

 #define	TELOPTS
 #define	TELCMDS
--- a/telnetd/authenc.c
+++ b/telnetd/authenc.c
@ -31,13 +31,13 @@
 * SUCH DAMAGE.
 */

-#include <sys/cdefs.h>
-
-__FBSDID("$FreeBSD$");
-
+#if 0
 #ifndef lint
 static const char sccsid[] = "@(#)authenc.c	8.2 (Berkeley) 5/30/95";
 #endif
+#endif
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");

 #ifdef	AUTHENTICATION
 #ifdef	ENCRYPTION
--- 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 <sys/cdefs.h>
+__FBSDID("$FreeBSD$");

 /*
 * Allocate global variables.  We do this
--- a/telnetd/slc.c
+++ b/telnetd/slc.c
@ -31,13 +31,13 @@
 * SUCH DAMAGE.
 */

-#include <sys/cdefs.h>
-
-__FBSDID("$FreeBSD$");
-
+#if 0
 #ifndef lint
 static const char sccsid[] = "@(#)slc.c	8.2 (Berkeley) 5/30/95";
 #endif
+#endif
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");

 #include "telnetd.h"

--- a/telnetd/state.c
+++ b/telnetd/state.c
@ -31,13 +31,13 @@
 * SUCH DAMAGE.
 */

-#include <sys/cdefs.h>
-
-__FBSDID("$FreeBSD$");
-
+#if 0
 #ifndef lint
 static const char sccsid[] = "@(#)state.c	8.5 (Berkeley) 5/30/95";
 #endif
+#endif
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");

 #include <stdarg.h>
 #include "telnetd.h"
--- a/telnetd/sys_term.c
+++ b/telnetd/sys_term.c
@ -31,13 +31,13 @@
 * SUCH DAMAGE.
 */

-#include <sys/cdefs.h>
-
-__FBSDID("$FreeBSD$");
-
+#if 0
 #ifndef lint
 static const char sccsid[] = "@(#)sys_term.c	8.4+1 (Berkeley) 5/30/95";
 #endif
+#endif
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");

 #include <sys/types.h>
 #include <sys/tty.h>
--- a/telnetd/telnetd.c
+++ b/telnetd/telnetd.c
@ -31,13 +31,13 @@
 * SUCH DAMAGE.
 */

-#include <sys/cdefs.h>
-
-__FBSDID("$FreeBSD$");
-
+#if 0
 #ifndef lint
 static const char sccsid[] = "@(#)telnetd.c	8.4 (Berkeley) 5/30/95";
 #endif
+#endif
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");

 #include "telnetd.h"
 #include "pathnames.h"
--- a/telnetd/termstat.c
+++ b/telnetd/termstat.c
@ -31,13 +31,13 @@
 * SUCH DAMAGE.
 */

-#include <sys/cdefs.h>
-
-__FBSDID("$FreeBSD$");
-
+#if 0
 #ifndef lint
 static const char sccsid[] = "@(#)termstat.c	8.2 (Berkeley) 5/30/95";
 #endif
+#endif
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");

 #include "telnetd.h"

--- 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 <sys/cdefs.h>
+__FBSDID("$FreeBSD$");

 #ifdef __FreeBSD__
 #include <locale.h>