Use __FBSDID().

Also some minor style cleanups.

21 files changed, 74 insertions, 49 deletions

diff --git a/sys/boot/common/bcache.c b/sys/boot/common/bcache.c
index fb8de49..d61fbf0 100644
--- a/sys/boot/common/bcache.c
+++ b/sys/boot/common/bcache.c
@@ -22,10 +22,11 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- * $FreeBSD$
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 /*
  * Simple LRU block cache
  */
diff --git a/sys/boot/common/boot.c b/sys/boot/common/boot.c
index 571c6c9..766a8cf 100644
--- a/sys/boot/common/boot.c
+++ b/sys/boot/common/boot.c
@@ -22,10 +22,11 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- * $FreeBSD$
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 /*
  * Loading modules, booting the system
  */
diff --git a/sys/boot/common/commands.c b/sys/boot/common/commands.c
index be69606..38aa0a3 100644
--- a/sys/boot/common/commands.c
+++ b/sys/boot/common/commands.c
@@ -22,10 +22,11 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- * $FreeBSD$
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <stand.h>
 #include <string.h>
 
diff --git a/sys/boot/common/console.c b/sys/boot/common/console.c
index 3f2a879..0fc138c 100644
--- a/sys/boot/common/console.c
+++ b/sys/boot/common/console.c
@@ -22,10 +22,11 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- * $FreeBSD$
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <stand.h>
 #include <string.h>
 
diff --git a/sys/boot/common/dev_net.c b/sys/boot/common/dev_net.c
index d0ed701..6e97f63 100644
--- a/sys/boot/common/dev_net.c
+++ b/sys/boot/common/dev_net.c
@@ -1,6 +1,5 @@
 /*	
- * $FreeBSD$
- * From: $NetBSD: dev_net.c,v 1.12 1997/12/10 20:38:37 gwr Exp $
+ * $NetBSD: dev_net.c,v 1.12 1997/12/10 20:38:37 gwr Exp $
  */
 
 /*-
@@ -39,7 +38,10 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-/*
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
+/*-
  * This module implements a "raw device" interface suitable for
  * use by the stand-alone I/O library NFS code.  This interface
  * does not support any "block" access, and exists only for the
diff --git a/sys/boot/common/devopen.c b/sys/boot/common/devopen.c
index 77d6ffa..28a2fab 100644
--- a/sys/boot/common/devopen.c
+++ b/sys/boot/common/devopen.c
@@ -22,10 +22,10 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- * $FreeBSD$
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 #include <stand.h>
 #include <string.h>
diff --git a/sys/boot/common/interp.c b/sys/boot/common/interp.c
index 7ebab61..33f48e6 100644
--- a/sys/boot/common/interp.c
+++ b/sys/boot/common/interp.c
@@ -22,9 +22,11 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- * $FreeBSD$
  */
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 /*
  * Simple commandline interpreter, toplevel and misc.
  *
diff --git a/sys/boot/common/interp_backslash.c b/sys/boot/common/interp_backslash.c
index 8bbeb34..3cbdd5b 100644
--- a/sys/boot/common/interp_backslash.c
+++ b/sys/boot/common/interp_backslash.c
@@ -1,4 +1,4 @@
-/*
+/*-
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -11,11 +11,12 @@
  * Jordan K. Hubbard
  * 29 August 1998
  *
- * $FreeBSD$
- *
  * Routine for doing backslash elimination.
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <stand.h>
 #include <string.h>
 #include "bootstrap.h"
diff --git a/sys/boot/common/interp_forth.c b/sys/boot/common/interp_forth.c
index 45cff4e..cc66c4d 100644
--- a/sys/boot/common/interp_forth.c
+++ b/sys/boot/common/interp_forth.c
@@ -1,4 +1,4 @@
-/*
+/*-
  * Copyright (c) 1998 Michael Smith <msmith@freebsd.org>
  * All rights reserved.
  *
@@ -22,10 +22,11 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- * $FreeBSD$
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/param.h>		/* to pick up __FreeBSD_version */
 #include <string.h>
 #include <stand.h>
diff --git a/sys/boot/common/interp_parse.c b/sys/boot/common/interp_parse.c
index c57001a..32b01c8 100644
--- a/sys/boot/common/interp_parse.c
+++ b/sys/boot/common/interp_parse.c
@@ -1,4 +1,4 @@
-/*
+/*-
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -11,11 +11,12 @@
  * Jordan K. Hubbard
  * 29 August 1998
  *
- * $FreeBSD$
- * 
  * The meat of the simple parser.
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <stand.h>
 #include <string.h>
 #include "bootstrap.h"
diff --git a/sys/boot/common/isapnp.c b/sys/boot/common/isapnp.c
index 0c5646d..a8efb28 100644
--- a/sys/boot/common/isapnp.c
+++ b/sys/boot/common/isapnp.c
@@ -1,4 +1,4 @@
-/*
+/*-
  * Copyright (c) 1998, Michael Smith
  * Copyright (c) 1996, Sujal M. Patel
  * All rights reserved.
@@ -23,10 +23,11 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- * $FreeBSD$
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 /*
  * Machine-independant ISA PnP enumerator implementing a subset of the
  * ISA PnP specification.
diff --git a/sys/boot/common/load.c b/sys/boot/common/load.c
index e91c5fb..e00487d 100644
--- a/sys/boot/common/load.c
+++ b/sys/boot/common/load.c
@@ -22,10 +22,11 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- * $FreeBSD$
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <stand.h>
 
 #define LOAD_TINYBUF	2048
diff --git a/sys/boot/common/load_elf.c b/sys/boot/common/load_elf.c
index 31d5d59..06c6897 100644
--- a/sys/boot/common/load_elf.c
+++ b/sys/boot/common/load_elf.c
@@ -23,10 +23,11 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- * $FreeBSD$
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/param.h>
 #include <sys/exec.h>
 #include <sys/linker.h>
diff --git a/sys/boot/common/load_elf32.c b/sys/boot/common/load_elf32.c
index 59b6496..1de5dc1 100644
--- a/sys/boot/common/load_elf32.c
+++ b/sys/boot/common/load_elf32.c
@@ -1,3 +1,6 @@
-/* $FreeBSD$ */
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #define __ELF_WORD_SIZE 32
+
 #include "load_elf.c"
diff --git a/sys/boot/common/load_elf64.c b/sys/boot/common/load_elf64.c
index d5f99d9..c29e8e3 100644
--- a/sys/boot/common/load_elf64.c
+++ b/sys/boot/common/load_elf64.c
@@ -1,3 +1,6 @@
-/* $FreeBSD$ */
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #define __ELF_WORD_SIZE 64
+
 #include "load_elf.c"
diff --git a/sys/boot/common/ls.c b/sys/boot/common/ls.c
index 6fc48fd..86f83c3 100644
--- a/sys/boot/common/ls.c
+++ b/sys/boot/common/ls.c
@@ -1,9 +1,8 @@
 /*
- * $FreeBSD$
- * From: $NetBSD: ls.c,v 1.3 1997/06/13 13:48:47 drochner Exp $
+ * $NetBSD: ls.c,v 1.3 1997/06/13 13:48:47 drochner Exp $
  */
 
-/*
+/*-
  * Copyright (c) 1993
  *	The Regents of the University of California.  All rights reserved.
  * Copyright (c) 1996
@@ -38,6 +37,8 @@
  * SUCH DAMAGE.
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 #include <sys/param.h>
 #include <ufs/ufs/dinode.h>
diff --git a/sys/boot/common/misc.c b/sys/boot/common/misc.c
index bc33c53..9f38b60 100644
--- a/sys/boot/common/misc.c
+++ b/sys/boot/common/misc.c
@@ -22,10 +22,11 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- * $FreeBSD$
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <string.h>
 #include <stand.h>
 #include <bootstrap.h>
diff --git a/sys/boot/common/module.c b/sys/boot/common/module.c
index 3237049..ae93426 100644
--- a/sys/boot/common/module.c
+++ b/sys/boot/common/module.c
@@ -22,10 +22,11 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- * $FreeBSD$
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 /*
  * file/module function dispatcher, support, etc.
  */
diff --git a/sys/boot/common/panic.c b/sys/boot/common/panic.c
index dfebd97..181c4c7 100644
--- a/sys/boot/common/panic.c
+++ b/sys/boot/common/panic.c
@@ -1,9 +1,7 @@
 /*
- * $FreeBSD$
- * From: $NetBSD: panic.c,v 1.2 1997/03/22 01:48:36 thorpej Exp $
+ * $NetBSD: panic.c,v 1.2 1997/03/22 01:48:36 thorpej Exp $
  */
-
-/*
+/*-
  * Copyright (c) 1996
  *	Matthias Drochner.  All rights reserved.
  *
@@ -35,6 +33,8 @@
  *
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 #include <stand.h>
 #include <machine/stdarg.h>
diff --git a/sys/boot/common/pnp.c b/sys/boot/common/pnp.c
index f7dbf31..05cce99 100644
--- a/sys/boot/common/pnp.c
+++ b/sys/boot/common/pnp.c
@@ -1,8 +1,11 @@
 /*
  * mjs copyright
  *
- * $FreeBSD$
  */
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 /*
  * "Plug and Play" functionality.
  *
diff --git a/sys/boot/common/ufsread.c b/sys/boot/common/ufsread.c
index 7f46615..0b7c3f4 100644
--- a/sys/boot/common/ufsread.c
+++ b/sys/boot/common/ufsread.c
@@ -1,4 +1,4 @@
-/*
+/*-
  * Copyright (c) 2002 Networks Associates Technology, Inc.
  * All rights reserved.
  *
@@ -22,9 +22,8 @@
  * purpose.
  */
 
-/*
- * $FreeBSD$
- */
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 #include <ufs/ufs/dinode.h>
 #include <ufs/ffs/fs.h>