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.

10 files changed, 60 insertions, 50 deletions

diff --git a/usr.bin/ar/append.c b/usr.bin/ar/append.c
index 151ae0a..b891b9e 100644
--- a/usr.bin/ar/append.c
+++ b/usr.bin/ar/append.c
@@ -34,14 +34,15 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-
-__FBSDID("$FreeBSD$");
-
+#if 0
 #ifndef lint
-static const char sccsid[] = "@(#)append.c	8.3 (Berkeley) 4/2/94";
+static char sccsid[] = "@(#)append.c	8.3 (Berkeley) 4/2/94";
+#endif
 #endif /* not lint */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/param.h>
 #include <sys/stat.h>
 
diff --git a/usr.bin/ar/ar.c b/usr.bin/ar/ar.c
index f4bc76a..b951d67 100644
--- a/usr.bin/ar/ar.c
+++ b/usr.bin/ar/ar.c
@@ -34,19 +34,20 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-
-__FBSDID("$FreeBSD$");
-
 #ifndef lint
 static const char copyright[] =
 "@(#) Copyright (c) 1990, 1993, 1994\n\
 	The Regents of the University of California.  All rights reserved.\n";
 #endif
 
+#if 0
 #ifndef lint
-static const char sccsid[] = "@(#)ar.c	8.3 (Berkeley) 4/2/94";
+static char sccsid[] = "@(#)ar.c	8.3 (Berkeley) 4/2/94";
 #endif
+#endif
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 #include <sys/param.h>
 
diff --git a/usr.bin/ar/archive.c b/usr.bin/ar/archive.c
index e85695a..b347fb7 100644
--- a/usr.bin/ar/archive.c
+++ b/usr.bin/ar/archive.c
@@ -34,13 +34,14 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-
-__FBSDID("$FreeBSD$");
-
+#if 0
 #ifndef lint
-static const char sccsid[] = "@(#)archive.c	8.3 (Berkeley) 4/2/94";
+static char sccsid[] = "@(#)archive.c	8.3 (Berkeley) 4/2/94";
 #endif
+#endif
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 #include <sys/param.h>
 #include <sys/stat.h>
diff --git a/usr.bin/ar/contents.c b/usr.bin/ar/contents.c
index 6243984..c53c323 100644
--- a/usr.bin/ar/contents.c
+++ b/usr.bin/ar/contents.c
@@ -34,13 +34,14 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-
-__FBSDID("$FreeBSD$");
-
+#if 0
 #ifndef lint
-static const char sccsid[] = "@(#)contents.c	8.3 (Berkeley) 4/2/94";
+static char sccsid[] = "@(#)contents.c	8.3 (Berkeley) 4/2/94";
 #endif
+#endif
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 #include <sys/param.h>
 #include <sys/stat.h>
diff --git a/usr.bin/ar/delete.c b/usr.bin/ar/delete.c
index 7174845..53e7f92 100644
--- a/usr.bin/ar/delete.c
+++ b/usr.bin/ar/delete.c
@@ -34,13 +34,14 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-
-__FBSDID("$FreeBSD$");
-
+#if 0
 #ifndef lint
-static const char sccsid[] = "@(#)delete.c	8.3 (Berkeley) 4/2/94";
+static char sccsid[] = "@(#)delete.c	8.3 (Berkeley) 4/2/94";
 #endif
+#endif
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 #include <sys/param.h>
 #include <sys/stat.h>
diff --git a/usr.bin/ar/extract.c b/usr.bin/ar/extract.c
index 36c31e3..9d53f97 100644
--- a/usr.bin/ar/extract.c
+++ b/usr.bin/ar/extract.c
@@ -34,13 +34,14 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-
-__FBSDID("$FreeBSD$");
-
+#if 0
 #ifndef lint
-static const char sccsid[] = "@(#)extract.c	8.3 (Berkeley) 4/2/94";
+static char sccsid[] = "@(#)extract.c	8.3 (Berkeley) 4/2/94";
 #endif
+#endif
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 #include <sys/param.h>
 #include <sys/time.h>
diff --git a/usr.bin/ar/misc.c b/usr.bin/ar/misc.c
index 5e76b19..d3c3ba2 100644
--- a/usr.bin/ar/misc.c
+++ b/usr.bin/ar/misc.c
@@ -34,13 +34,14 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-
-__FBSDID("$FreeBSD$");
-
+#if 0
 #ifndef lint
-static const char sccsid[] = "@(#)misc.c	8.3 (Berkeley) 4/2/94";
+static char sccsid[] = "@(#)misc.c	8.3 (Berkeley) 4/2/94";
 #endif
+#endif
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 #include <sys/param.h>
 
diff --git a/usr.bin/ar/move.c b/usr.bin/ar/move.c
index d416b8a..8240b5c 100644
--- a/usr.bin/ar/move.c
+++ b/usr.bin/ar/move.c
@@ -34,13 +34,14 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-
-__FBSDID("$FreeBSD$");
-
+#if 0
 #ifndef lint
-static const char sccsid[] = "@(#)move.c	8.3 (Berkeley) 4/2/94";
+static char sccsid[] = "@(#)move.c	8.3 (Berkeley) 4/2/94";
 #endif
+#endif
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 #include <sys/param.h>
 #include <sys/stat.h>
diff --git a/usr.bin/ar/print.c b/usr.bin/ar/print.c
index 6854cee..19ef47e 100644
--- a/usr.bin/ar/print.c
+++ b/usr.bin/ar/print.c
@@ -34,13 +34,14 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-
-__FBSDID("$FreeBSD$");
-
+#if 0
 #ifndef lint
-static const char sccsid[] = "@(#)print.c	8.3 (Berkeley) 4/2/94";
+static char sccsid[] = "@(#)print.c	8.3 (Berkeley) 4/2/94";
 #endif
+#endif
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 #include <sys/param.h>
 
diff --git a/usr.bin/ar/replace.c b/usr.bin/ar/replace.c
index e14be94..3dffd04 100644
--- a/usr.bin/ar/replace.c
+++ b/usr.bin/ar/replace.c
@@ -34,13 +34,14 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-
-__FBSDID("$FreeBSD$");
-
+#if 0
 #ifndef lint
-static const char sccsid[] = "@(#)replace.c	8.3 (Berkeley) 4/2/94";
+static char sccsid[] = "@(#)replace.c	8.3 (Berkeley) 4/2/94";
 #endif
+#endif
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 #include <sys/param.h>
 #include <sys/stat.h>