From 96d4258af94bd2a9eec38eda0969044389c23d91 Mon Sep 17 00:00:00 2001
From: obrien <obrien@FreeBSD.org>
Date: Thu, 3 Apr 2003 21:36:33 +0000
Subject: Use __FBSDID rather than rcsid[].

---
 sys/boot/efi/libefi/copy.c        | 6 ++----
 sys/boot/efi/libefi/delay.c       | 6 ++----
 sys/boot/efi/libefi/efi_console.c | 6 ++----
 sys/boot/efi/libefi/libefi.c      | 6 ++----
 sys/boot/efi/libefi/module.c      | 6 ++----
 sys/boot/efi/libefi/time.c        | 6 ++----
 sys/boot/efi/loader/conf.c        | 6 ++----
 sys/boot/efi/loader/main.c        | 6 ++----
 sys/boot/ia64/common/copy.c       | 6 ++----
 sys/boot/ia64/efi/conf.c          | 6 ++----
 sys/boot/ia64/efi/main.c          | 6 ++----
 sys/boot/ia64/libski/copy.c       | 6 ++----
 sys/boot/ia64/libski/delay.c      | 6 ++----
 sys/boot/ia64/libski/exit.c       | 6 ++----
 sys/boot/ia64/libski/module.c     | 7 +++----
 sys/boot/ia64/libski/skiconsole.c | 6 ++----
 sys/boot/ia64/libski/time.c       | 6 ++----
 sys/boot/ia64/ski/conf.c          | 5 ++---
 sys/boot/ia64/ski/copy.c          | 6 ++----
 sys/boot/ia64/ski/delay.c         | 6 ++----
 sys/boot/ia64/ski/exit.c          | 6 ++----
 sys/boot/ia64/ski/main.c          | 6 ++----
 sys/boot/ia64/ski/skiconsole.c    | 6 ++----
 sys/boot/ia64/ski/time.c          | 6 ++----
 sys/boot/ia64/skiload/conf.c      | 5 ++---
 sys/boot/ia64/skiload/main.c      | 6 ++----
 26 files changed, 53 insertions(+), 102 deletions(-)

(limited to 'sys/boot')

diff --git a/sys/boot/efi/libefi/copy.c b/sys/boot/efi/libefi/copy.c
index be1fcef..7bc4edf 100644
--- a/sys/boot/efi/libefi/copy.c
+++ b/sys/boot/efi/libefi/copy.c
@@ -24,10 +24,8 @@
  * SUCH DAMAGE.
  */
 
-#ifndef lint
-static const char rcsid[] =
-  "$FreeBSD$";
-#endif /* not lint */
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 /*
  * MD primitives supporting placement of module data 
diff --git a/sys/boot/efi/libefi/delay.c b/sys/boot/efi/libefi/delay.c
index 2a5b98b..723f681 100644
--- a/sys/boot/efi/libefi/delay.c
+++ b/sys/boot/efi/libefi/delay.c
@@ -24,10 +24,8 @@
  * SUCH DAMAGE.
  */
 
-#ifndef lint
-static const char rcsid[] =
-  "$FreeBSD$";
-#endif /* not lint */
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 #include <efi.h>
 #include <efilib.h>
diff --git a/sys/boot/efi/libefi/efi_console.c b/sys/boot/efi/libefi/efi_console.c
index 254ef0d..c88462e 100644
--- a/sys/boot/efi/libefi/efi_console.c
+++ b/sys/boot/efi/libefi/efi_console.c
@@ -24,10 +24,8 @@
  * SUCH DAMAGE.
  */
 
-#ifndef lint
-static const char rcsid[] =
-  "$FreeBSD$";
-#endif /* not lint */
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 #include <efi.h>
 #include <efilib.h>
diff --git a/sys/boot/efi/libefi/libefi.c b/sys/boot/efi/libefi/libefi.c
index abfa6a8..563b533 100644
--- a/sys/boot/efi/libefi/libefi.c
+++ b/sys/boot/efi/libefi/libefi.c
@@ -24,10 +24,8 @@
  * SUCH DAMAGE.
  */
 
-#ifndef lint
-static const char rcsid[] =
-  "$FreeBSD$";
-#endif /* not lint */
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 #include <efi.h>
 #include <efilib.h>
diff --git a/sys/boot/efi/libefi/module.c b/sys/boot/efi/libefi/module.c
index 6c07e28..7a3f4b2 100644
--- a/sys/boot/efi/libefi/module.c
+++ b/sys/boot/efi/libefi/module.c
@@ -24,10 +24,8 @@
  * SUCH DAMAGE.
  */
 
-#ifndef lint
-static const char rcsid[] =
-  "$FreeBSD$";
-#endif /* not lint */
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 #include <stand.h>
 
diff --git a/sys/boot/efi/libefi/time.c b/sys/boot/efi/libefi/time.c
index 27192de..3ca456e 100644
--- a/sys/boot/efi/libefi/time.c
+++ b/sys/boot/efi/libefi/time.c
@@ -38,10 +38,8 @@
  * 
  */
 
-#ifndef lint
-static const char rcsid[] =
-  "$FreeBSD$";
-#endif /* not lint */
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 #include <efi.h>
 #include <efilib.h>
diff --git a/sys/boot/efi/loader/conf.c b/sys/boot/efi/loader/conf.c
index 0e5407c..145b16b 100644
--- a/sys/boot/efi/loader/conf.c
+++ b/sys/boot/efi/loader/conf.c
@@ -31,10 +31,8 @@
  *	$NetBSD: conf.c,v 1.2 1997/03/22 09:03:29 thorpej Exp $	 
  */
 
-#ifndef lint
-static const char rcsid[] =
-  "$FreeBSD$";
-#endif /* not lint */
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 #include <stand.h>
 #include <efi.h>
diff --git a/sys/boot/efi/loader/main.c b/sys/boot/efi/loader/main.c
index bc1c044..58b9620 100644
--- a/sys/boot/efi/loader/main.c
+++ b/sys/boot/efi/loader/main.c
@@ -25,10 +25,8 @@
  * SUCH DAMAGE.
  */
 
-#ifndef lint
-static const char rcsid[] =
-  "$FreeBSD$";
-#endif /* not lint */
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 #include <stand.h>
 #include <string.h>
diff --git a/sys/boot/ia64/common/copy.c b/sys/boot/ia64/common/copy.c
index be1fcef..7bc4edf 100644
--- a/sys/boot/ia64/common/copy.c
+++ b/sys/boot/ia64/common/copy.c
@@ -24,10 +24,8 @@
  * SUCH DAMAGE.
  */
 
-#ifndef lint
-static const char rcsid[] =
-  "$FreeBSD$";
-#endif /* not lint */
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 /*
  * MD primitives supporting placement of module data 
diff --git a/sys/boot/ia64/efi/conf.c b/sys/boot/ia64/efi/conf.c
index 0e5407c..145b16b 100644
--- a/sys/boot/ia64/efi/conf.c
+++ b/sys/boot/ia64/efi/conf.c
@@ -31,10 +31,8 @@
  *	$NetBSD: conf.c,v 1.2 1997/03/22 09:03:29 thorpej Exp $	 
  */
 
-#ifndef lint
-static const char rcsid[] =
-  "$FreeBSD$";
-#endif /* not lint */
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 #include <stand.h>
 #include <efi.h>
diff --git a/sys/boot/ia64/efi/main.c b/sys/boot/ia64/efi/main.c
index bc1c044..58b9620 100644
--- a/sys/boot/ia64/efi/main.c
+++ b/sys/boot/ia64/efi/main.c
@@ -25,10 +25,8 @@
  * SUCH DAMAGE.
  */
 
-#ifndef lint
-static const char rcsid[] =
-  "$FreeBSD$";
-#endif /* not lint */
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 #include <stand.h>
 #include <string.h>
diff --git a/sys/boot/ia64/libski/copy.c b/sys/boot/ia64/libski/copy.c
index d5c0623..d86537a 100644
--- a/sys/boot/ia64/libski/copy.c
+++ b/sys/boot/ia64/libski/copy.c
@@ -24,10 +24,8 @@
  * SUCH DAMAGE.
  */
 
-#ifndef lint
-static const char rcsid[] =
-  "$FreeBSD$";
-#endif /* not lint */
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 /*
  * MD primitives supporting placement of module data 
diff --git a/sys/boot/ia64/libski/delay.c b/sys/boot/ia64/libski/delay.c
index b4e9dff..2389603 100644
--- a/sys/boot/ia64/libski/delay.c
+++ b/sys/boot/ia64/libski/delay.c
@@ -24,10 +24,8 @@
  * SUCH DAMAGE.
  */
 
-#ifndef lint
-static const char rcsid[] =
-  "$FreeBSD$";
-#endif /* not lint */
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 void
 delay(int usecs)
diff --git a/sys/boot/ia64/libski/exit.c b/sys/boot/ia64/libski/exit.c
index 5648580..aeac67c 100644
--- a/sys/boot/ia64/libski/exit.c
+++ b/sys/boot/ia64/libski/exit.c
@@ -24,10 +24,8 @@
  * SUCH DAMAGE.
  */
 
-#ifndef lint
-static const char rcsid[] =
-  "$FreeBSD$";
-#endif /* not lint */
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 #include <sys/param.h>
 #include <sys/time.h>
diff --git a/sys/boot/ia64/libski/module.c b/sys/boot/ia64/libski/module.c
index 596add7..0e77cfe 100644
--- a/sys/boot/ia64/libski/module.c
+++ b/sys/boot/ia64/libski/module.c
@@ -24,10 +24,9 @@
  * SUCH DAMAGE.
  */
 
-#ifndef lint
-static const char rcsid[] =
-  "$FreeBSD$";
-#endif /* not lint */
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 #include <stand.h>
 
diff --git a/sys/boot/ia64/libski/skiconsole.c b/sys/boot/ia64/libski/skiconsole.c
index 5038ce1..e5cea3d 100644
--- a/sys/boot/ia64/libski/skiconsole.c
+++ b/sys/boot/ia64/libski/skiconsole.c
@@ -24,10 +24,8 @@
  * SUCH DAMAGE.
  */
 
-#ifndef lint
-static const char rcsid[] =
-  "$FreeBSD$";
-#endif /* not lint */
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 #include <stand.h>
 
diff --git a/sys/boot/ia64/libski/time.c b/sys/boot/ia64/libski/time.c
index 7e49886..b682c2d 100644
--- a/sys/boot/ia64/libski/time.c
+++ b/sys/boot/ia64/libski/time.c
@@ -38,10 +38,8 @@
  * 
  */
 
-#ifndef lint
-static const char rcsid[] =
-  "$FreeBSD$";
-#endif /* not lint */
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 #include <time.h>
 #include <sys/time.h>
diff --git a/sys/boot/ia64/ski/conf.c b/sys/boot/ia64/ski/conf.c
index 6db907c..3fe58f8 100644
--- a/sys/boot/ia64/ski/conf.c
+++ b/sys/boot/ia64/ski/conf.c
@@ -31,10 +31,9 @@
  *	$NetBSD: conf.c,v 1.2 1997/03/22 09:03:29 thorpej Exp $	 
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 #ifndef lint
-static const char rcsid[] =
-  "$FreeBSD$";
-#endif /* not lint */
 
 #include <stand.h>
 
diff --git a/sys/boot/ia64/ski/copy.c b/sys/boot/ia64/ski/copy.c
index d5c0623..d86537a 100644
--- a/sys/boot/ia64/ski/copy.c
+++ b/sys/boot/ia64/ski/copy.c
@@ -24,10 +24,8 @@
  * SUCH DAMAGE.
  */
 
-#ifndef lint
-static const char rcsid[] =
-  "$FreeBSD$";
-#endif /* not lint */
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 /*
  * MD primitives supporting placement of module data 
diff --git a/sys/boot/ia64/ski/delay.c b/sys/boot/ia64/ski/delay.c
index b4e9dff..2389603 100644
--- a/sys/boot/ia64/ski/delay.c
+++ b/sys/boot/ia64/ski/delay.c
@@ -24,10 +24,8 @@
  * SUCH DAMAGE.
  */
 
-#ifndef lint
-static const char rcsid[] =
-  "$FreeBSD$";
-#endif /* not lint */
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 void
 delay(int usecs)
diff --git a/sys/boot/ia64/ski/exit.c b/sys/boot/ia64/ski/exit.c
index 5648580..aeac67c 100644
--- a/sys/boot/ia64/ski/exit.c
+++ b/sys/boot/ia64/ski/exit.c
@@ -24,10 +24,8 @@
  * SUCH DAMAGE.
  */
 
-#ifndef lint
-static const char rcsid[] =
-  "$FreeBSD$";
-#endif /* not lint */
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 #include <sys/param.h>
 #include <sys/time.h>
diff --git a/sys/boot/ia64/ski/main.c b/sys/boot/ia64/ski/main.c
index cd3c479..c4b2225 100644
--- a/sys/boot/ia64/ski/main.c
+++ b/sys/boot/ia64/ski/main.c
@@ -25,10 +25,8 @@
  * SUCH DAMAGE.
  */
 
-#ifndef lint
-static const char rcsid[] =
-  "$FreeBSD$";
-#endif /* not lint */
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 #include <stand.h>
 #include <string.h>
diff --git a/sys/boot/ia64/ski/skiconsole.c b/sys/boot/ia64/ski/skiconsole.c
index 5038ce1..e5cea3d 100644
--- a/sys/boot/ia64/ski/skiconsole.c
+++ b/sys/boot/ia64/ski/skiconsole.c
@@ -24,10 +24,8 @@
  * SUCH DAMAGE.
  */
 
-#ifndef lint
-static const char rcsid[] =
-  "$FreeBSD$";
-#endif /* not lint */
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 #include <stand.h>
 
diff --git a/sys/boot/ia64/ski/time.c b/sys/boot/ia64/ski/time.c
index 7e49886..b682c2d 100644
--- a/sys/boot/ia64/ski/time.c
+++ b/sys/boot/ia64/ski/time.c
@@ -38,10 +38,8 @@
  * 
  */
 
-#ifndef lint
-static const char rcsid[] =
-  "$FreeBSD$";
-#endif /* not lint */
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 #include <time.h>
 #include <sys/time.h>
diff --git a/sys/boot/ia64/skiload/conf.c b/sys/boot/ia64/skiload/conf.c
index 6db907c..3fe58f8 100644
--- a/sys/boot/ia64/skiload/conf.c
+++ b/sys/boot/ia64/skiload/conf.c
@@ -31,10 +31,9 @@
  *	$NetBSD: conf.c,v 1.2 1997/03/22 09:03:29 thorpej Exp $	 
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 #ifndef lint
-static const char rcsid[] =
-  "$FreeBSD$";
-#endif /* not lint */
 
 #include <stand.h>
 
diff --git a/sys/boot/ia64/skiload/main.c b/sys/boot/ia64/skiload/main.c
index cd3c479..c4b2225 100644
--- a/sys/boot/ia64/skiload/main.c
+++ b/sys/boot/ia64/skiload/main.c
@@ -25,10 +25,8 @@
  * SUCH DAMAGE.
  */
 
-#ifndef lint
-static const char rcsid[] =
-  "$FreeBSD$";
-#endif /* not lint */
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 #include <stand.h>
 #include <string.h>
-- 
cgit v1.1