From d20f95e12191bf347c34331595936a559ea28cb2 Mon Sep 17 00:00:00 2001
From: Mark Murray <markm@FreeBSD.org>
Date: Wed, 12 Dec 2001 23:23:52 +0000
Subject: [PATCH] Minor style stuff, use __FBSDID(), remove to-be-default
 WARNS=2.

---
 usr.bin/script/Makefile |  1 -
 usr.bin/script/script.c | 16 ++++++++--------
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/usr.bin/script/Makefile b/usr.bin/script/Makefile
index ac3a59c83c7..50ba12e696a 100644
--- a/usr.bin/script/Makefile
+++ b/usr.bin/script/Makefile
@@ -2,7 +2,6 @@
 # $FreeBSD$
 
 PROG=	script
-WARNS?=	2
 LDADD=	-lutil
 DPADD=	${LIBUTIL}
 
diff --git a/usr.bin/script/script.c b/usr.bin/script/script.c
index 115c1f9aff0..d6abb90f0df 100644
--- a/usr.bin/script/script.c
+++ b/usr.bin/script/script.c
@@ -31,19 +31,19 @@
  * SUCH DAMAGE.
  */
 
+#include <sys/cdefs.h>
+
+__FBSDID("$FreeBSD$");
+
 #ifndef lint
 static const char copyright[] =
 "@(#) Copyright (c) 1980, 1992, 1993\n\
 	The Regents of the University of California.  All rights reserved.\n";
-#endif /* not lint */
+#endif
 
 #ifndef lint
-#if 0
-static char sccsid[] = "@(#)script.c	8.1 (Berkeley) 6/6/93";
+static const char sccsid[] = "@(#)script.c	8.1 (Berkeley) 6/6/93";
 #endif
-static const char rcsid[] =
-  "$FreeBSD$";
-#endif /* not lint */
 
 #include <sys/types.h>
 #include <sys/wait.h>
@@ -66,7 +66,7 @@ static const char rcsid[] =
 FILE	*fscript;
 int	master, slave;
 int	child;
-const char	*fname;
+const char *fname;
 int	qflg;
 
 struct	termios tt;
@@ -83,7 +83,7 @@ main(argc, argv)
 	int argc;
 	char *argv[];
 {
-	register int cc;
+	int cc;
 	struct termios rtt, stt;
 	struct winsize win;
 	int aflg, kflg, ch, n;