From 0a6a74520bd28b82f7cfa2f5c7df235b7664f67d Mon Sep 17 00:00:00 2001
From: Matthew Dillon <dillon@FreeBSD.org>
Date: Sat, 15 Sep 2001 19:36:55 +0000
Subject: [PATCH] Revamp FBSDID's for libatm.  Restore original import rcsid as
 per bde

Reviewed by:	various people
---
 lib/libatm/atm_addr.c    | 14 +++++++-------
 lib/libatm/cache_key.c   |  9 ++-------
 lib/libatm/ioctl_subr.c  |  8 ++------
 lib/libatm/ip_addr.c     |  8 ++------
 lib/libatm/ip_checksum.c |  9 ++-------
 lib/libatm/timer.c       |  8 ++------
 6 files changed, 17 insertions(+), 39 deletions(-)

diff --git a/lib/libatm/atm_addr.c b/lib/libatm/atm_addr.c
index c8695f8d4464..ff6b2c2d501c 100644
--- a/lib/libatm/atm_addr.c
+++ b/lib/libatm/atm_addr.c
@@ -22,10 +22,14 @@
  *
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
- *
- *	@(#) $FreeBSD$
- *
  */
+#include <sys/cdefs.h>
+#ifndef lint
+#if 0	/* original (broken) import id */
+static char *RCSid = "@(#) $Id: atm_addr.c,v 1.1 1998/07/09 21:45:18 johnc Exp $";
+#endif
+#endif
+__FBSDID("$FreeBSD$");
 
 /*
  * User Space Library Functions
@@ -36,7 +40,6 @@
  */
 
 #include <sys/types.h>
-#include <sys/cdefs.h>
 #include <sys/param.h>
 #include <sys/socket.h>
 #include <net/if.h>
@@ -53,11 +56,8 @@
 
 #include "libatm.h"
 
-__FBSDID("$FreeBSD$");
-
 extern char	*prog;
 
-
 /*
  * Get NSAP, NSAP prefix or MAC address
  *
diff --git a/lib/libatm/cache_key.c b/lib/libatm/cache_key.c
index 8d9006b2629d..95c8943561e4 100644
--- a/lib/libatm/cache_key.c
+++ b/lib/libatm/cache_key.c
@@ -22,11 +22,9 @@
  *
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
- *
- *	@(#) $FreeBSD$
- *
  */
-
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 /*
  * User Space Library Functions
@@ -37,7 +35,6 @@
  */
 
 #include <sys/types.h>
-#include <sys/cdefs.h>
 #include <sys/param.h>
 #include <sys/socket.h>
 #include <net/if.h>
@@ -54,8 +51,6 @@
 
 #include "libatm.h"
 
-__FBSDID("$FreeBSD$");
-
 /*
  * Compute an SCSP cache key
  *
diff --git a/lib/libatm/ioctl_subr.c b/lib/libatm/ioctl_subr.c
index 1571f6d04e7d..66f8d863f178 100644
--- a/lib/libatm/ioctl_subr.c
+++ b/lib/libatm/ioctl_subr.c
@@ -22,10 +22,9 @@
  *
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
- *
- *	@(#) $FreeBSD$
- *
  */
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 /*
  * User Space Library Functions
@@ -36,7 +35,6 @@
  */
 
 #include <sys/types.h>
-#include <sys/cdefs.h>
 #include <sys/param.h>
 #include <sys/socket.h>
 #include <sys/sockio.h>
@@ -56,8 +54,6 @@
 
 #include "libatm.h"
 
-__FBSDID("$FreeBSD$");
-
 #ifndef	TRUE
 #define	TRUE	1
 #endif
diff --git a/lib/libatm/ip_addr.c b/lib/libatm/ip_addr.c
index 6a18141b1f13..eefd156ad7aa 100644
--- a/lib/libatm/ip_addr.c
+++ b/lib/libatm/ip_addr.c
@@ -22,10 +22,9 @@
  *
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
- *
- *	@(#) $FreeBSD$
- *
  */
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 /*
  * User Space Library Functions
@@ -36,7 +35,6 @@
  */
 
 #include <sys/types.h>
-#include <sys/cdefs.h>
 #include <sys/param.h>
 #include <sys/socket.h>
 #include <net/if.h>
@@ -54,8 +52,6 @@
 
 #include "libatm.h"
 
-__FBSDID("$FreeBSD$");
-
 /*
  * Get IP address
  *
diff --git a/lib/libatm/ip_checksum.c b/lib/libatm/ip_checksum.c
index d80742db8108..e0181905b9b3 100644
--- a/lib/libatm/ip_checksum.c
+++ b/lib/libatm/ip_checksum.c
@@ -22,11 +22,9 @@
  *
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
- *
- *	@(#) $FreeBSD$
- *
  */
-
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 /*
  * User Space Library Functions
@@ -37,7 +35,6 @@
  */
 
 #include <sys/types.h>
-#include <sys/cdefs.h>
 #include <sys/param.h>
 #include <sys/socket.h>
 #include <net/if.h>
@@ -51,8 +48,6 @@
 
 #include "libatm.h"
 
-__FBSDID("$FreeBSD$");
-
 /*
  * Compute an IP checksum
  *
diff --git a/lib/libatm/timer.c b/lib/libatm/timer.c
index 10baf8f94032..fa7f2642d188 100644
--- a/lib/libatm/timer.c
+++ b/lib/libatm/timer.c
@@ -22,10 +22,9 @@
  *
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
- *
- *	@(#) $FreeBSD$
- *
  */
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 /*
  * User Space Library Functions
@@ -36,7 +35,6 @@
  */
 
 #include <sys/types.h>
-#include <sys/cdefs.h>
 #include <sys/param.h>
 #include <sys/socket.h>
 #include <net/if.h>
@@ -54,8 +52,6 @@
 
 #include "libatm.h"
 
-__FBSDID("$FreeBSD$");
-
 Harp_timer	*harp_timer_head;
 int		harp_timer_exec;