WARNS=2 fix, remove 'register' and use __FBSDID().

1 files changed, 18 insertions, 18 deletions

diff --git a/usr.bin/finger/util.c b/usr.bin/finger/util.c
index 5095abc..8f81f50 100644
--- a/usr.bin/finger/util.c
+++ b/usr.bin/finger/util.c
@@ -34,13 +34,13 @@
  * SUCH DAMAGE.
  */
 
+#include <sys/cdefs.h>
+
+__FBSDID("$FreeBSD$");
+
 #ifndef lint
-#if 0
-static char sccsid[] = "@(#)util.c	8.3 (Berkeley) 4/28/95";
+static const char sccsid[] = "@(#)util.c	8.3 (Berkeley) 4/28/95";
 #endif
-static const char rcsid[] =
-  "$FreeBSD$";
-#endif /* not lint */
 
 #include <sys/param.h>
 #include <sys/stat.h>
@@ -68,7 +68,7 @@ match(pw, user)
 	struct passwd *pw;
 	char *user;
 {
-	register char *p, *t;
+	char *p, *t;
 	char name[1024];
 
 	if (!strcasecmp(pw->pw_name, user))
@@ -107,9 +107,9 @@ match(pw, user)
 
 void
 enter_lastlog(pn)
-	register PERSON *pn;
+	PERSON *pn;
 {
-	register WHERE *w;
+	WHERE *w;
 	static int opened, fd;
 	struct lastlog ll;
 	char doit = 0;
@@ -160,7 +160,7 @@ enter_where(ut, pn)
 	struct utmp *ut;
 	PERSON *pn;
 {
-	register WHERE *w;
+	WHERE *w;
 
 	w = walloc(pn);
 	w->info = LOGGEDIN;
@@ -174,7 +174,7 @@ enter_where(ut, pn)
 
 PERSON *
 enter_person(pw)
-	register struct passwd *pw;
+	struct passwd *pw;
 {
 	DBT data, key;
 	PERSON *pn;
@@ -214,7 +214,7 @@ find_person(name)
 {
 	struct passwd *pw;
 
-	register int cnt;
+	int cnt;
 	DBT data, key;
 	PERSON *p;
 	char buf[UT_NAMESIZE + 1];
@@ -250,9 +250,9 @@ palloc()
 
 static WHERE *
 walloc(pn)
-	register PERSON *pn;
+	PERSON *pn;
 {
-	register WHERE *w;
+	WHERE *w;
 
 	if ((w = malloc((u_int) sizeof(WHERE))) == NULL)
 		err(1, NULL);
@@ -270,7 +270,7 @@ char *
 prphone(num)
 	char *num;
 {
-	register char *p;
+	char *p;
 	int len;
 	static char pbuf[20];
 
@@ -318,7 +318,7 @@ prphone(num)
 
 static void
 find_idle_and_ttywrite(w)
-	register WHERE *w;
+	WHERE *w;
 {
 	extern time_t now;
 	struct stat sb;
@@ -342,10 +342,10 @@ find_idle_and_ttywrite(w)
 
 static void
 userinfo(pn, pw)
-	register PERSON *pn;
-	register struct passwd *pw;
+	PERSON *pn;
+	struct passwd *pw;
 {
-	register char *p, *t;
+	char *p, *t;
 	char *bp, name[1024];
 	struct stat sb;