Make the __FBSDID usage consistent

and protect copyright[] from Gcc 3.3's whining.

6 files changed, 22 insertions, 26 deletions

diff --git a/games/caesar/caesar.c b/games/caesar/caesar.c
index a92131e..54275ce 100644
--- a/games/caesar/caesar.c
+++ b/games/caesar/caesar.c
@@ -39,6 +39,7 @@
  * SUCH DAMAGE.
  */
 
+#if 0
 #ifndef lint
 static const char copyright[] =
 "@(#) Copyright (c) 1989, 1993\n\
@@ -46,13 +47,11 @@ static const char copyright[] =
 #endif /* not lint */
 
 #ifndef lint
-#if 0
 static const char sccsid[] = "@(#)caesar.c    8.1 (Berkeley) 5/31/93";
-#else
-static const char rcsid[] =
-  "$FreeBSD$";
-#endif
 #endif /* not lint */
+#endif
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 #include <errno.h>
 #include <math.h>
diff --git a/games/fortune/fortune/fortune.c b/games/fortune/fortune/fortune.c
index ad95e53..3234d2d 100644
--- a/games/fortune/fortune/fortune.c
+++ b/games/fortune/fortune/fortune.c
@@ -34,6 +34,7 @@
  * SUCH DAMAGE.
  */
 
+#if 0
 #ifndef lint
 static const char copyright[] =
 "@(#) Copyright (c) 1986, 1993\n\
@@ -41,12 +42,11 @@ static const char copyright[] =
 #endif /* not lint */
 
 #ifndef lint
-#if 0
 static const char sccsid[] = "@(#)fortune.c   8.1 (Berkeley) 5/31/93";
-#endif
-static const char rcsid[] =
- "$FreeBSD$";
 #endif /* not lint */
+#endif
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 # include	<sys/stat.h>
 
diff --git a/games/fortune/strfile/strfile.c b/games/fortune/strfile/strfile.c
index 5c62c0a..c0ef528 100644
--- a/games/fortune/strfile/strfile.c
+++ b/games/fortune/strfile/strfile.c
@@ -34,6 +34,7 @@
  * SUCH DAMAGE.
  */
 
+#if 0
 #ifndef lint
 static const char copyright[] =
 "@(#) Copyright (c) 1989, 1993\n\
@@ -41,13 +42,11 @@ static const char copyright[] =
 #endif /* not lint */
 
 #ifndef lint
-#if 0
 static const char sccsid[] = "@(#)strfile.c   8.1 (Berkeley) 5/31/93";
-#else
-static const char rcsid[] =
-  "$FreeBSD$";
-#endif
 #endif /* not lint */
+#endif
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 # include	<sys/param.h>
 # include	<arpa/inet.h>
diff --git a/games/fortune/unstr/unstr.c b/games/fortune/unstr/unstr.c
index 1512026..44c7a9f 100644
--- a/games/fortune/unstr/unstr.c
+++ b/games/fortune/unstr/unstr.c
@@ -34,6 +34,7 @@
  * SUCH DAMAGE.
  */
 
+#if 0
 #ifndef lint
 static const char copyright[] =
 "@(#) Copyright (c) 1991, 1993\n\
@@ -41,13 +42,11 @@ static const char copyright[] =
 #endif /* not lint */
 
 #ifndef lint
-#if 0
 static const char sccsid[] = "@(#)unstr.c     8.1 (Berkeley) 5/31/93";
-#else
-static const char rcsid[] =
-  "$FreeBSD$";
-#endif
 #endif /* not lint */
+#endif
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 /*
  *	This program un-does what "strfile" makes, thereby obtaining the
diff --git a/games/pom/pom.c b/games/pom/pom.c
index b590991..ea8a608 100644
--- a/games/pom/pom.c
+++ b/games/pom/pom.c
@@ -33,6 +33,7 @@
  * SUCH DAMAGE.
  */
 
+#if 0
 #ifndef lint
 static const char copyright[] =
 "@(#) Copyright (c) 1989, 1993\n\
@@ -40,12 +41,11 @@ static const char copyright[] =
 #endif /* not lint */
 
 #ifndef lint
-#if 0
 static const char sccsid[] = "@(#)pom.c       8.1 (Berkeley) 5/31/93";
-#endif
-static const char rcsid[] =
- "$FreeBSD$";
 #endif /* not lint */
+#endif
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 /*
  * Phase of the Moon.  Calculates the current phase of the moon.
diff --git a/games/random/random.c b/games/random/random.c
index 7b45f6e..e7c85bb 100644
--- a/games/random/random.c
+++ b/games/random/random.c
@@ -34,6 +34,7 @@
  * SUCH DAMAGE.
  */
 
+#if 0
 #ifndef lint
 static const char copyright[] =
 "@(#) Copyright (c) 1994\n\
@@ -41,11 +42,9 @@ static const char copyright[] =
 #endif /* not lint */
 
 #ifndef lint
-#if 0
 static const char sccsid[] = "@(#)random.c	8.5 (Berkeley) 4/5/94";
-#endif
 #endif /* not lint */
-
+#endif
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");