Use __FBSDID().

9 files changed, 26 insertions, 81 deletions

diff --git a/sys/netatm/spans/spans_arp.c b/sys/netatm/spans/spans_arp.c
index e0c83f9..d8ff78b 100644
--- a/sys/netatm/spans/spans_arp.c
+++ b/sys/netatm/spans/spans_arp.c
@@ -1,5 +1,4 @@
 /*
- *
  * ===================================
  * HARP  |  Host ATM Research Platform
  * ===================================
@@ -22,9 +21,6 @@
  *
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
- *
- *	@(#) $FreeBSD$
- *
  */
 
 /*
@@ -32,9 +28,11 @@
  * ---------------------------
  *
  * SPANS CLS - ARP support
- *
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/types.h>
@@ -69,11 +67,6 @@
 
 #include <vm/uma.h>
 
-#ifndef lint
-__RCSID("@(#) $FreeBSD$");
-#endif
-
-
 /*
  * Global variables
  */
diff --git a/sys/netatm/spans/spans_cls.c b/sys/netatm/spans/spans_cls.c
index 5b93892..bfd6c24 100644
--- a/sys/netatm/spans/spans_cls.c
+++ b/sys/netatm/spans/spans_cls.c
@@ -1,5 +1,4 @@
 /*
- *
  * ===================================
  * HARP  |  Host ATM Research Platform
  * ===================================
@@ -22,9 +21,6 @@
  *
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
- *
- *	@(#) $FreeBSD$
- *
  */
 
 /*
@@ -32,9 +28,11 @@
  * ---------------------------
  *
  * SPANS Connectionless Datagram Service (CLS) module
- *
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/param.h>
 #include <sys/types.h>
 #include <sys/systm.h>
@@ -67,11 +65,6 @@
 
 #include <vm/uma.h>
 
-#ifndef lint
-__RCSID("@(#) $FreeBSD$");
-#endif
-
-
 /*
  * Global variables
  */
diff --git a/sys/netatm/spans/spans_if.c b/sys/netatm/spans/spans_if.c
index f4c1bf1..3ea781c 100644
--- a/sys/netatm/spans/spans_if.c
+++ b/sys/netatm/spans/spans_if.c
@@ -1,5 +1,4 @@
 /*
- *
  * ===================================
  * HARP  |  Host ATM Research Platform
  * ===================================
@@ -22,9 +21,6 @@
  *
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
- *
- *	@(#) $FreeBSD$
- *
  */
 
 /*
@@ -33,9 +29,11 @@
  *
  * External interfaces to SPANS manager.  Includes support for
  * running as a loadable kernel module.
- *
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #ifndef ATM_SPANS_MODULE
 #include "opt_atm.h"
 #endif
@@ -69,10 +67,6 @@
 #include "spans_xdr.h"
 #include <netatm/spans/spans_var.h>
 
-#ifndef lint
-__RCSID("@(#) $FreeBSD$");
-#endif
-
 /*
  * Global variables
  */
diff --git a/sys/netatm/spans/spans_kxdr.c b/sys/netatm/spans/spans_kxdr.c
index 7a56dcc..def97d3 100644
--- a/sys/netatm/spans/spans_kxdr.c
+++ b/sys/netatm/spans/spans_kxdr.c
@@ -1,5 +1,4 @@
 /*
- *
  * ===================================
  * HARP  |  Host ATM Research Platform
  * ===================================
@@ -29,12 +28,8 @@
  * ---------------------------
  *
  * Kernel XDR (External Data Representation) routines
- *
  */
 
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/types.h>
@@ -84,6 +79,8 @@ __FBSDID("$FreeBSD$");
 /*static char *sccsid = "from: @(#)xdr.c 1.35 87/08/12";*/
 /*static char *sccsid = "from: @(#)xdr.c	2.1 88/07/29 4.0 RPCSRC";*/
 #endif
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 /*
  * xdr.c, Generic XDR routines implementation.
diff --git a/sys/netatm/spans/spans_msg.c b/sys/netatm/spans/spans_msg.c
index c597080..a578a12 100644
--- a/sys/netatm/spans/spans_msg.c
+++ b/sys/netatm/spans/spans_msg.c
@@ -1,5 +1,4 @@
 /*
- *
  * ===================================
  * HARP  |  Host ATM Research Platform
  * ===================================
@@ -22,9 +21,6 @@
  *
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
- *
- *	@(#) $FreeBSD$
- *
  */
 
 /*
@@ -32,9 +28,11 @@
  * ---------------------------
  *
  * SPANS signalling message processing.
- *
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/types.h>
@@ -61,10 +59,6 @@
 #include "spans_xdr.h"
 #include <netatm/spans/spans_var.h>
 
-#ifndef lint
-__RCSID("@(#) $FreeBSD$");
-#endif
-
 /*
  * External functions
  */
diff --git a/sys/netatm/spans/spans_print.c b/sys/netatm/spans/spans_print.c
index 9ab7dfc..68daa18 100644
--- a/sys/netatm/spans/spans_print.c
+++ b/sys/netatm/spans/spans_print.c
@@ -1,5 +1,4 @@
 /*
- *
  * ===================================
  * HARP  |  Host ATM Research Platform
  * ===================================
@@ -22,9 +21,6 @@
  *
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
- *
- *	@(#) $FreeBSD$
- *
  */
 
 /*
@@ -32,9 +28,11 @@
  * ---------------------------
  *
  * SPANS Print Routines.
- *
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/types.h>
@@ -54,10 +52,6 @@
 #include "spans_xdr.h"
 #include <netatm/spans/spans_var.h>
 
-#ifndef lint
-__RCSID("@(#) $FreeBSD$");
-#endif
-
 /*
  * If LONGPRINT is defined, every field of the SPANS message will be
  * printed.  If not, a shorter summary (useful for debugging without
diff --git a/sys/netatm/spans/spans_proto.c b/sys/netatm/spans/spans_proto.c
index 7562820..d1376c5 100644
--- a/sys/netatm/spans/spans_proto.c
+++ b/sys/netatm/spans/spans_proto.c
@@ -1,5 +1,4 @@
 /*
- *
  * ===================================
  * HARP  |  Host ATM Research Platform
  * ===================================
@@ -22,9 +21,6 @@
  *
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
- *
- *	@(#) $FreeBSD$
- *
  */
 
 /*
@@ -32,9 +28,11 @@
  * ---------------------------
  *
  * SPANS protocol processing module.
- *
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/types.h>
@@ -60,10 +58,6 @@
 #include "spans_xdr.h"
 #include <netatm/spans/spans_var.h>
 
-#ifndef lint
-__RCSID("@(#) $FreeBSD$");
-#endif
-
 /*
  * Internal functions
  */
diff --git a/sys/netatm/spans/spans_subr.c b/sys/netatm/spans/spans_subr.c
index 93ea6d4..19263dd 100644
--- a/sys/netatm/spans/spans_subr.c
+++ b/sys/netatm/spans/spans_subr.c
@@ -1,5 +1,4 @@
 /*
- *
  * ===================================
  * HARP  |  Host ATM Research Platform
  * ===================================
@@ -22,9 +21,6 @@
  *
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
- *
- *	@(#) $FreeBSD$
- *
  */
 
 /*
@@ -32,9 +28,11 @@
  * ---------------------------
  *
  * SPANS-related subroutines.
- *
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/param.h>
 #include <sys/types.h>
 #include <sys/systm.h>
@@ -61,11 +59,6 @@
 #include "spans_xdr.h"
 #include <netatm/spans/spans_var.h>
 
-#ifndef lint
-__RCSID("@(#) $FreeBSD$");
-#endif
-
-
 /*
  * Open a SPANS VCC
  *
diff --git a/sys/netatm/spans/spans_util.c b/sys/netatm/spans/spans_util.c
index 2b34219..15638cd 100644
--- a/sys/netatm/spans/spans_util.c
+++ b/sys/netatm/spans/spans_util.c
@@ -1,5 +1,4 @@
 /*
- *
  * ===================================
  * HARP  |  Host ATM Research Platform
  * ===================================
@@ -22,9 +21,6 @@
  *
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
- *
- *	@(#) $FreeBSD$
- *
  */
 
 /*
@@ -32,9 +28,11 @@
  * ---------------------------
  *
  * SPANS-related utility routines.
- *
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/types.h>
@@ -54,11 +52,6 @@
 #include "spans_xdr.h"
 #include <netatm/spans/spans_var.h>
 
-#ifndef lint
-__RCSID("@(#) $FreeBSD$");
-#endif
-
-
 #ifdef NOTDEF
 /* XXX -- Remove all SAP checks? */
 #define	MAX_SAP_ENT	1