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.

12 files changed, 72 insertions, 60 deletions

diff --git a/usr.bin/yacc/closure.c b/usr.bin/yacc/closure.c
index 5921c78..f7e7b55 100644
--- a/usr.bin/yacc/closure.c
+++ b/usr.bin/yacc/closure.c
@@ -34,16 +34,17 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
+#if 0
+#ifndef lint
+static char sccsid[] = "@(#)closure.c	5.3 (Berkeley) 5/24/93";
+#endif
+#endif
 
+#include <sys/cdefs.h>
 #ifdef __FBSDID
 __FBSDID("$FreeBSD$");
 #endif
 
-#ifndef lint
-static char const sccsid[] = "@(#)closure.c	5.3 (Berkeley) 5/24/93";
-#endif
-
 #include <stdlib.h>
 #include "defs.h"
 
diff --git a/usr.bin/yacc/error.c b/usr.bin/yacc/error.c
index 7158000..e563693 100644
--- a/usr.bin/yacc/error.c
+++ b/usr.bin/yacc/error.c
@@ -34,16 +34,17 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
+#if 0
+#ifndef lint
+static char sccsid[] = "@(#)error.c	5.3 (Berkeley) 6/1/90";
+#endif
+#endif
 
+#include <sys/cdefs.h>
 #ifdef __FBSDID
 __FBSDID("$FreeBSD$");
 #endif
 
-#ifndef lint
-static char const sccsid[] = "@(#)error.c	5.3 (Berkeley) 6/1/90";
-#endif
-
 /* routines for printing error messages  */
 
 #include "defs.h"
diff --git a/usr.bin/yacc/lalr.c b/usr.bin/yacc/lalr.c
index 73be8fe..861644a 100644
--- a/usr.bin/yacc/lalr.c
+++ b/usr.bin/yacc/lalr.c
@@ -34,16 +34,17 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
+#if 0
+#ifndef lint
+static char sccsid[] = "@(#)lalr.c	5.3 (Berkeley) 6/1/90";
+#endif
+#endif
 
+#include <sys/cdefs.h>
 #ifdef __FBSDID
 __FBSDID("$FreeBSD$");
 #endif
 
-#ifndef lint
-static char const sccsid[] = "@(#)lalr.c	5.3 (Berkeley) 6/1/90";
-#endif
-
 #include <stdlib.h>
 #include "defs.h"
 
diff --git a/usr.bin/yacc/lr0.c b/usr.bin/yacc/lr0.c
index 94698a0..6f642fd 100644
--- a/usr.bin/yacc/lr0.c
+++ b/usr.bin/yacc/lr0.c
@@ -34,16 +34,17 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
+#if 0
+#ifndef lint
+static char sccsid[] = "@(#)lr0.c	5.3 (Berkeley) 1/20/91";
+#endif
+#endif
 
+#include <sys/cdefs.h>
 #ifdef __FBSDID
 __FBSDID("$FreeBSD$");
 #endif
 
-#ifndef lint
-static char const sccsid[] = "@(#)lr0.c	5.3 (Berkeley) 1/20/91";
-#endif
-
 #include <stdlib.h>
 #include "defs.h"
 
diff --git a/usr.bin/yacc/main.c b/usr.bin/yacc/main.c
index 4c427c3..cd1d5b8 100644
--- a/usr.bin/yacc/main.c
+++ b/usr.bin/yacc/main.c
@@ -34,16 +34,17 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
+#if 0
+#ifndef lint
+static char sccsid[] = "@(#)main.c	5.5 (Berkeley) 5/24/93";
+#endif
+#endif
 
+#include <sys/cdefs.h>
 #ifdef __FBSDID
 __FBSDID("$FreeBSD$");
 #endif
 
-#ifndef lint
-static char const sccsid[] = "@(#)main.c	5.5 (Berkeley) 5/24/93";
-#endif
-
 #include <signal.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/usr.bin/yacc/mkpar.c b/usr.bin/yacc/mkpar.c
index 34aa81d..7d61246 100644
--- a/usr.bin/yacc/mkpar.c
+++ b/usr.bin/yacc/mkpar.c
@@ -34,16 +34,17 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
+#if 0
+#ifndef lint
+static char sccsid[] = "@(#)mkpar.c	5.3 (Berkeley) 1/20/91";
+#endif
+#endif
 
+#include <sys/cdefs.h>
 #ifdef __FBSDID
 __FBSDID("$FreeBSD$");
 #endif
 
-#ifndef lint
-static char const sccsid[] = "@(#)mkpar.c	5.3 (Berkeley) 1/20/91";
-#endif
-
 #include <stdlib.h>
 #include "defs.h"
 
diff --git a/usr.bin/yacc/output.c b/usr.bin/yacc/output.c
index d6134c9..e7687c3 100644
--- a/usr.bin/yacc/output.c
+++ b/usr.bin/yacc/output.c
@@ -34,16 +34,17 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
+#if 0
+#ifndef lint
+static char sccsid[] = "@(#)output.c	5.7 (Berkeley) 5/24/93";
+#endif
+#endif
 
+#include <sys/cdefs.h>
 #ifdef __FBSDID
 __FBSDID("$FreeBSD$");
 #endif
 
-#ifndef lint
-static char const sccsid[] = "@(#)output.c	5.7 (Berkeley) 5/24/93";
-#endif
-
 #include <stdlib.h>
 #include <string.h>
 #include "defs.h"
diff --git a/usr.bin/yacc/reader.c b/usr.bin/yacc/reader.c
index 23a060f..8d54e92 100644
--- a/usr.bin/yacc/reader.c
+++ b/usr.bin/yacc/reader.c
@@ -34,16 +34,17 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
+#if 0
+#ifndef lint
+static char sccsid[] = "@(#)reader.c	5.7 (Berkeley) 1/20/91";
+#endif
+#endif
 
+#include <sys/cdefs.h>
 #ifdef __FBSDID
 __FBSDID("$FreeBSD$");
 #endif
 
-#ifndef lint
-static char const sccsid[] = "@(#)reader.c	5.7 (Berkeley) 1/20/91";
-#endif
-
 #include <stdlib.h>
 #include <string.h>
 #include "defs.h"
diff --git a/usr.bin/yacc/skeleton.c b/usr.bin/yacc/skeleton.c
index 5e7ce14..11a1855 100644
--- a/usr.bin/yacc/skeleton.c
+++ b/usr.bin/yacc/skeleton.c
@@ -34,16 +34,17 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
+#if 0
+#ifndef lint
+static char sccsid[] = "@(#)skeleton.c	5.8 (Berkeley) 4/29/95";
+#endif
+#endif
 
+#include <sys/cdefs.h>
 #ifdef __FBSDID
 __FBSDID("$FreeBSD$");
 #endif
 
-#ifndef lint
-static char const sccsid[] = "@(#)skeleton.c	5.8 (Berkeley) 4/29/95";
-#endif
-
 #include "defs.h"
 
 /*  The definition of yysccsid in the banner should be replaced with	*/
diff --git a/usr.bin/yacc/symtab.c b/usr.bin/yacc/symtab.c
index 8b8298c..c808d6a 100644
--- a/usr.bin/yacc/symtab.c
+++ b/usr.bin/yacc/symtab.c
@@ -34,16 +34,17 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
+#if 0
+#ifndef lint
+static char sccsid[] = "@(#)symtab.c	5.3 (Berkeley) 6/1/90";
+#endif
+#endif
 
+#include <sys/cdefs.h>
 #ifdef __FBSDID
 __FBSDID("$FreeBSD$");
 #endif
 
-#ifndef lint
-static char const sccsid[] = "@(#)symtab.c	5.3 (Berkeley) 6/1/90";
-#endif
-
 #include <stdlib.h>
 #include <string.h>
 #include "defs.h"
diff --git a/usr.bin/yacc/verbose.c b/usr.bin/yacc/verbose.c
index 2b37eef..e620650 100644
--- a/usr.bin/yacc/verbose.c
+++ b/usr.bin/yacc/verbose.c
@@ -34,16 +34,17 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
+#if 0
+#ifndef lint
+static char sccsid[] = "@(#)verbose.c	5.3 (Berkeley) 1/20/91";
+#endif
+#endif
 
+#include <sys/cdefs.h>
 #ifdef __FBSDID
 __FBSDID("$FreeBSD$");
 #endif
 
-#ifndef lint
-static char const sccsid[] = "@(#)verbose.c	5.3 (Berkeley) 1/20/91";
-#endif
-
 #include <stdlib.h>
 #include "defs.h"
 
diff --git a/usr.bin/yacc/warshall.c b/usr.bin/yacc/warshall.c
index 8f1cd1c..3c7bf1c 100644
--- a/usr.bin/yacc/warshall.c
+++ b/usr.bin/yacc/warshall.c
@@ -34,16 +34,17 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
+#if 0
+#ifndef lint
+static char sccsid[] = "@(#)warshall.c	5.4 (Berkeley) 5/24/93";
+#endif
+#endif
 
+#include <sys/cdefs.h>
 #ifdef __FBSDID
 __FBSDID("$FreeBSD$");
 #endif
 
-#ifndef lint
-static char const sccsid[] = "@(#)warshall.c	5.4 (Berkeley) 5/24/93";
-#endif
-
 #include "defs.h"
 
 static void transitive_closure __P((unsigned *, int));