From d9613ea3837925885145ecab86d9945be73cb303 Mon Sep 17 00:00:00 2001
From: dwmalone <dwmalone@FreeBSD.org>
Date: Mon, 10 Dec 2001 21:13:08 +0000
Subject: Style improvements recommended by Bruce as a follow up to some of the
 recent WARNS commits. The idea is:

1) FreeBSD id tags should follow vendor tags.
2) Vendor tags should not be compiled (though copyrights probably should).
3) There should be no blank line between including cdefs and __FBSDIF.
---
 usr.bin/finger/finger.c | 11 ++++++-----
 usr.bin/finger/lprint.c | 11 ++++++-----
 usr.bin/finger/net.c    | 11 ++++++-----
 usr.bin/finger/sprint.c | 11 ++++++-----
 usr.bin/finger/util.c   | 11 ++++++-----
 5 files changed, 30 insertions(+), 25 deletions(-)

(limited to 'usr.bin/finger')

diff --git a/usr.bin/finger/finger.c b/usr.bin/finger/finger.c
index 3240dcf..138021a 100644
--- a/usr.bin/finger/finger.c
+++ b/usr.bin/finger/finger.c
@@ -44,19 +44,20 @@
  *	login time is < 6 days.
  */
 
-#include <sys/cdefs.h>
-
-__FBSDID("$FreeBSD$");
-
 #ifndef lint
 static const char copyright[] =
 "@(#) Copyright (c) 1989, 1993\n\
 	The Regents of the University of California.  All rights reserved.\n";
 #endif /* not lint */
 
+#if 0
 #ifndef lint
-static const char sccsid[] = "@(#)finger.c	8.5 (Berkeley) 5/4/95";
+static char sccsid[] = "@(#)finger.c	8.5 (Berkeley) 5/4/95";
 #endif
+#endif
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 /*
  * Finger prints out information about users.  It is not portable since
diff --git a/usr.bin/finger/lprint.c b/usr.bin/finger/lprint.c
index 26f55c3..d8f649f 100644
--- a/usr.bin/finger/lprint.c
+++ b/usr.bin/finger/lprint.c
@@ -34,13 +34,14 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-
-__FBSDID("$FreeBSD$");
-
+#if 0
 #ifndef lint
-static const char sccsid[] = "@(#)lprint.c	8.3 (Berkeley) 4/28/95";
+static char sccsid[] = "@(#)lprint.c	8.3 (Berkeley) 4/28/95";
 #endif
+#endif
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 #include <sys/stat.h>
 #include <ctype.h>
diff --git a/usr.bin/finger/net.c b/usr.bin/finger/net.c
index 4bcb31b..67a7087 100644
--- a/usr.bin/finger/net.c
+++ b/usr.bin/finger/net.c
@@ -34,13 +34,14 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-
-__FBSDID("$FreeBSD$");
-
+#if 0
 #ifndef lint
-static const char sccsid[] = "@(#)net.c	8.4 (Berkeley) 4/28/95";
+static char sccsid[] = "@(#)net.c	8.4 (Berkeley) 4/28/95";
 #endif
+#endif
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 #include <sys/param.h>
 #include <sys/socket.h>
diff --git a/usr.bin/finger/sprint.c b/usr.bin/finger/sprint.c
index aaa74da..67fdcbb 100644
--- a/usr.bin/finger/sprint.c
+++ b/usr.bin/finger/sprint.c
@@ -34,13 +34,14 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-
-__FBSDID("$FreeBSD$");
-
+#if 0
 #ifndef lint
-static const char sccsid[] = "@(#)sprint.c	8.3 (Berkeley) 4/28/95";
+static char sccsid[] = "@(#)sprint.c	8.3 (Berkeley) 4/28/95";
 #endif
+#endif
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 #include <db.h>
 #include <err.h>
diff --git a/usr.bin/finger/util.c b/usr.bin/finger/util.c
index 8f81f50..3a001a2 100644
--- a/usr.bin/finger/util.c
+++ b/usr.bin/finger/util.c
@@ -34,13 +34,14 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-
-__FBSDID("$FreeBSD$");
-
+#if 0
 #ifndef lint
-static const char sccsid[] = "@(#)util.c	8.3 (Berkeley) 4/28/95";
+static char sccsid[] = "@(#)util.c	8.3 (Berkeley) 4/28/95";
 #endif
+#endif
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 #include <sys/param.h>
 #include <sys/stat.h>
-- 
cgit v1.1