Use __FBSDID().

svn path=/head/; revision=116189
2003-06-11 05:37:42 +00:00 · 2003-06-11 05:37:42 +00:00 · ab0de15baf · 2020-12-20 02:59:44 +00:00
commit ab0de15baf
parent 77e2a274d0
77 changed files with 242 additions and 152 deletions
--- a/sys/libkern/arc4random.c
+++ b/sys/libkern/arc4random.c
@ -6,10 +6,11 @@
 * think this stuff is worth it, you can buy me a beer in return.
 *
 * Dan Moschuk
- *
- * $FreeBSD$
 */

+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/types.h>
 #include <sys/random.h>
 #include <sys/libkern.h>
--- a/sys/libkern/ashldi3.c
+++ b/sys/libkern/ashldi3.c
@ -33,10 +33,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 <libkern/quad.h>

 /*
--- a/sys/libkern/ashrdi3.c
+++ b/sys/libkern/ashrdi3.c
@ -33,10 +33,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 <libkern/quad.h>

 /*
--- a/sys/libkern/bcd.c
+++ b/sys/libkern/bcd.c
@ -1,9 +1,11 @@
-/* $FreeBSD$ */
 /*
 * Some data-tables that are often used.
 * Cannot be copyrighted.
 */

+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/libkern.h>

 u_char const bcd2bin_data[] = {
--- a/sys/libkern/bcmp.c
+++ b/sys/libkern/bcmp.c
@ -29,10 +29,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/libkern.h>
 #include <machine/endian.h>

--- a/sys/libkern/bsearch.c
+++ b/sys/libkern/bsearch.c
@ -29,13 +29,13 @@
 * 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$
 */

 #if defined(LIBC_SCCS) && !defined(lint)
 static char sccsid[] = "@(#)bsearch.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");

 #include <sys/param.h>
 #include <sys/libkern.h>
--- a/sys/libkern/crc32.c
+++ b/sys/libkern/crc32.c
@ -36,11 +36,13 @@
 *      using byte-swap instructions
 *      polynomial $edb88320
 *
- * $FreeBSD$
 *
 * CRC32 code derived from work by Gary S. Brown.
 */

+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/param.h>
 #include <sys/systm.h>

--- a/sys/libkern/divdi3.c
+++ b/sys/libkern/divdi3.c
@ -33,10 +33,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 <libkern/quad.h>

 /*
--- a/sys/libkern/ffs.c
+++ b/sys/libkern/ffs.c
@ -29,10 +29,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/libkern.h>

 /*
--- a/sys/libkern/fnmatch.c
+++ b/sys/libkern/fnmatch.c
@ -32,10 +32,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$");
+
 /*
 * Function fnmatch() as specified in POSIX 1003.2-1992, section B.6.
 * Compares a filename or pathname to a pattern.
--- a/sys/libkern/iconv.c
+++ b/sys/libkern/iconv.c
@ -28,9 +28,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/systm.h>
 #include <sys/kernel.h>
--- a/sys/libkern/iconv_xlat.c
+++ b/sys/libkern/iconv_xlat.c
@ -28,9 +28,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/kernel.h>
 #include <sys/systm.h>
--- a/sys/libkern/index.c
+++ b/sys/libkern/index.c
@ -29,10 +29,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/libkern.h>

--- a/sys/libkern/inet_ntoa.c
+++ b/sys/libkern/inet_ntoa.c
@ -25,10 +25,11 @@
 * 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/systm.h>

--- a/sys/libkern/lshrdi3.c
+++ b/sys/libkern/lshrdi3.c
@ -33,10 +33,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 <libkern/quad.h>

 /*
--- a/sys/libkern/mcount.c
+++ b/sys/libkern/mcount.c
@ -29,10 +29,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/gmon.h>
 #ifdef _KERNEL
--- a/sys/libkern/moddi3.c
+++ b/sys/libkern/moddi3.c
@ -33,10 +33,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 <libkern/quad.h>

 /*
--- a/sys/libkern/qdivrem.c
+++ b/sys/libkern/qdivrem.c
@ -33,10 +33,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$");
+
 /*
 * Multiprecision divide.  This algorithm is from Knuth vol. 2 (2nd ed),
 * section 4.3.1, pp. 257--259.
--- a/sys/libkern/qsort.c
+++ b/sys/libkern/qsort.c
@ -29,10 +29,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/libkern.h>

 typedef int		 cmp_t(const void *, const void *);
--- a/sys/libkern/random.c
+++ b/sys/libkern/random.c
@ -31,9 +31,11 @@
 * SUCH DAMAGE.
 *
 *	@(#)random.c	8.1 (Berkeley) 6/10/93
- * $FreeBSD$
 */

+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/libkern.h>

 #define NSHUFF 100      /* to drop part of seed -> 1st value correlation */
--- a/sys/libkern/rindex.c
+++ b/sys/libkern/rindex.c
@ -29,10 +29,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/libkern.h>

--- a/sys/libkern/scanc.c
+++ b/sys/libkern/scanc.c
@ -31,10 +31,11 @@
 * SUCH DAMAGE.
 *
 *	@(#)scanc.c	8.1 (Berkeley) 6/10/93
- *
- * $FreeBSD$
 */

+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/libkern.h>

 int
--- a/sys/libkern/skpc.c
+++ b/sys/libkern/skpc.c
@ -31,10 +31,11 @@
 * SUCH DAMAGE.
 *
 *	@(#)skpc.c	8.1 (Berkeley) 6/10/93
- *
- * $FreeBSD$
 */

+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/libkern.h>

 int
--- a/sys/libkern/strcat.c
+++ b/sys/libkern/strcat.c
@ -29,10 +29,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/libkern.h>

 char *
--- a/sys/libkern/strcmp.c
+++ b/sys/libkern/strcmp.c
@ -32,10 +32,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/libkern.h>

 /*
--- a/sys/libkern/strcpy.c
+++ b/sys/libkern/strcpy.c
@ -29,10 +29,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/libkern.h>

 char *
--- a/sys/libkern/strdup.c
+++ b/sys/libkern/strdup.c
@ -27,10 +27,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/kernel.h>
 #include <sys/libkern.h>
--- a/sys/libkern/strlen.c
+++ b/sys/libkern/strlen.c
@ -29,10 +29,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/libkern.h>

 size_t
--- a/sys/libkern/strncmp.c
+++ b/sys/libkern/strncmp.c
@ -29,10 +29,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/libkern.h>

 int
--- a/sys/libkern/strncpy.c
+++ b/sys/libkern/strncpy.c
@ -32,10 +32,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/libkern.h>

 /*
--- a/sys/libkern/strtol.c
+++ b/sys/libkern/strtol.c
@ -33,11 +33,12 @@
 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 * SUCH DAMAGE.
 *
- * From: static char sccsid[] = "@(#)strtol.c	8.1 (Berkeley) 6/4/93";
- *
- * $FreeBSD$
+ * From: @(#)strtol.c	8.1 (Berkeley) 6/4/93
 */

+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/ctype.h>
--- a/sys/libkern/strtoq.c
+++ b/sys/libkern/strtoq.c
@ -32,10 +32,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/systm.h>
 #include <sys/ctype.h>
--- a/sys/libkern/strtoul.c
+++ b/sys/libkern/strtoul.c
@ -33,11 +33,12 @@
 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 * SUCH DAMAGE.
 *
- * From: static char sccsid[] = "@(#)strtoul.c	8.1 (Berkeley) 6/4/93";
- *
- * $FreeBSD$
+ * From: @(#)strtoul.c	8.1 (Berkeley) 6/4/93
 */

+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/ctype.h>
--- a/sys/libkern/strtouq.c
+++ b/sys/libkern/strtouq.c
@ -32,10 +32,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/systm.h>
 #include <sys/ctype.h>
--- a/sys/libkern/strvalid.c
+++ b/sys/libkern/strvalid.c
@ -30,10 +30,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/types.h>
 #include <sys/libkern.h>

--- a/sys/libkern/ucmpdi2.c
+++ b/sys/libkern/ucmpdi2.c
@ -33,10 +33,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 <libkern/quad.h>

 /*
--- a/sys/libkern/udivdi3.c
+++ b/sys/libkern/udivdi3.c
@ -33,10 +33,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 <libkern/quad.h>

 /*
--- a/sys/libkern/umoddi3.c
+++ b/sys/libkern/umoddi3.c
@ -33,10 +33,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 <libkern/quad.h>

 /*
--- a/sys/netipx/ipx.c
+++ b/sys/netipx/ipx.c
@ -32,10 +32,11 @@
 * SUCH DAMAGE.
 * 
 *	@(#)ipx.c
- *
- * $FreeBSD$
 */

+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/malloc.h>
--- a/sys/netipx/ipx_cksum.c
+++ b/sys/netipx/ipx_cksum.c
@ -32,10 +32,11 @@
 * SUCH DAMAGE.
 *
 *	@(#)ipx_cksum.c
- *
- * $FreeBSD$
 */

+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/param.h>
 #include <sys/mbuf.h>
 #include <sys/libkern.h>
--- a/sys/netipx/ipx_input.c
+++ b/sys/netipx/ipx_input.c
@ -32,10 +32,11 @@
 * SUCH DAMAGE.
 *
 *	@(#)ipx_input.c
- *
- * $FreeBSD$
 */

+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/mbuf.h>
--- a/sys/netipx/ipx_ip.c
+++ b/sys/netipx/ipx_ip.c
@ -32,10 +32,11 @@
 * SUCH DAMAGE.
 * 
 *	@(#)ipx_ip.c
- *
- * $FreeBSD$
 */

+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 /*
 * Software interface driver for encapsulating IPX in IP.
 */
--- a/sys/netipx/ipx_outputfl.c
+++ b/sys/netipx/ipx_outputfl.c
@ -32,10 +32,11 @@
 * SUCH DAMAGE.
 *
 *	@(#)ipx_outputfl.c
- *
- * $FreeBSD$
 */

+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/mbuf.h>
--- a/sys/netipx/ipx_pcb.c
+++ b/sys/netipx/ipx_pcb.c
@ -32,10 +32,11 @@
 * SUCH DAMAGE.
 *
 *	@(#)ipx_pcb.c
- *
- * $FreeBSD$
 */

+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/malloc.h>
--- a/sys/netipx/ipx_proto.c
+++ b/sys/netipx/ipx_proto.c
@ -32,10 +32,11 @@
 * SUCH DAMAGE.
 *
 *	@(#)ipx_proto.c
- *
- * $FreeBSD$
 */

+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include "opt_ipx.h"

 #include <sys/param.h>
--- a/sys/netipx/ipx_usrreq.c
+++ b/sys/netipx/ipx_usrreq.c
@ -32,10 +32,11 @@
 * SUCH DAMAGE.
 *
 *	@(#)ipx_usrreq.c
- *
- * $FreeBSD$
 */

+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include "opt_ipx.h"

 #include <sys/param.h>
--- a/sys/netipx/spx_debug.c
+++ b/sys/netipx/spx_debug.c
@ -32,10 +32,11 @@
 * SUCH DAMAGE.
 *
 *	@(#)spx_debug.c
- *
- * $FreeBSD$
 */

+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include "opt_inet.h"
 #include "opt_tcpdebug.h"

--- a/sys/netipx/spx_usrreq.c
+++ b/sys/netipx/spx_usrreq.c
@ -32,10 +32,11 @@
 * SUCH DAMAGE.
 *
 *	@(#)spx_usrreq.h
- *
- * $FreeBSD$
 */

+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/param.h>
 #include <sys/lock.h>
 #include <sys/malloc.h>
--- a/sys/netkey/key.c
+++ b/sys/netkey/key.c
@ -1,4 +1,3 @@
-/*	$FreeBSD$	*/
 /*	$KAME: key.c,v 1.191 2001/06/27 10:46:49 sakane Exp $	*/

 /*
@ -30,6 +29,9 @@
 * SUCH DAMAGE.
 */

+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 /*
 * This code is referd to RFC 2367
 */
--- a/sys/netkey/key_debug.c
+++ b/sys/netkey/key_debug.c
@ -1,4 +1,3 @@
-/*	$FreeBSD$	*/
 /*	$KAME: key_debug.c,v 1.26 2001/06/27 10:46:50 sakane Exp $	*/

 /*
@ -30,6 +29,9 @@
 * SUCH DAMAGE.
 */

+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #ifdef _KERNEL
 #include "opt_inet.h"
 #include "opt_inet6.h"
--- a/sys/netkey/keydb.c
+++ b/sys/netkey/keydb.c
@ -1,4 +1,3 @@
-/*	$FreeBSD$	*/
 /*	$KAME: keydb.c,v 1.64 2000/05/11 17:02:30 itojun Exp $	*/

 /*
@ -30,6 +29,9 @@
 * SUCH DAMAGE.
 */

+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include "opt_inet.h"
 #include "opt_inet6.h"

--- a/sys/netkey/keysock.c
+++ b/sys/netkey/keysock.c
@ -1,4 +1,3 @@
-/*	$FreeBSD$	*/
 /*	$KAME: keysock.c,v 1.25 2001/08/13 20:07:41 itojun Exp $	*/

 /*
@ -30,6 +29,9 @@
 * SUCH DAMAGE.
 */

+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include "opt_ipsec.h"

 /* This code has derived from sys/net/rtsock.c on FreeBSD2.2.5 */
--- a/sys/netnatm/natm.c
+++ b/sys/netnatm/natm.c
@ -1,6 +1,4 @@
 /*	$NetBSD: natm.c,v 1.5 1996/11/09 03:26:26 chuck Exp $	*/
-/* $FreeBSD$ */
-
 /*
 *
 * Copyright (c) 1996 Charles D. Cranor and Washington University.
@ -37,6 +35,9 @@
 * natm.c: native mode ATM access (both aal0 and aal5).
 */

+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/param.h>
 #include <sys/conf.h>
 #include <sys/kernel.h>
--- a/sys/netnatm/natm_pcb.c
+++ b/sys/netnatm/natm_pcb.c
@ -1,6 +1,4 @@
-/* $FreeBSD$ */
 /*	$NetBSD: natm_pcb.c,v 1.4 1996/11/09 03:26:27 chuck Exp $	*/
-
 /*
 *
 * Copyright (c) 1996 Charles D. Cranor and Washington University.
@ -38,6 +36,9 @@
 * from trying to use each other's VCs.
 */

+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/malloc.h>
--- a/sys/netnatm/natm_proto.c
+++ b/sys/netnatm/natm_proto.c
@ -1,5 +1,4 @@
 /*	$NetBSD: natm_proto.c,v 1.3 1996/09/18 00:56:41 chuck Exp $	*/
-
 /*
 *
 * Copyright (c) 1996 Charles D. Cranor and Washington University.
@ -30,14 +29,15 @@
 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 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$
 */

 /*
 * protocol layer for access to native mode ATM
 */

+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
--- a/sys/netncp/ncp_conn.c
+++ b/sys/netncp/ncp_conn.c
@ -28,10 +28,13 @@
 * 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$
 *
 * Connection tables
 */
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
--- a/sys/netncp/ncp_crypt.c
+++ b/sys/netncp/ncp_crypt.c
@ -1,11 +1,3 @@
-/* 
- * $FreeBSD$
- */
-#include <sys/param.h>
-#include <sys/systm.h>
-#include <netncp/ncp.h>
-#include <netncp/ncp_subr.h>
-
 /*
 *  Routines in this file based on work of Volker Lendecke
 */
@ -24,7 +16,13 @@
   $*
   $********************************************************* */

+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");

+#include <sys/param.h>
+#include <sys/systm.h>
+#include <netncp/ncp.h>
+#include <netncp/ncp_subr.h>

 typedef unsigned char buf32[32];

--- a/sys/netncp/ncp_login.c
+++ b/sys/netncp/ncp_login.c
@ -28,9 +28,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/errno.h>
 #include <sys/malloc.h>
@ -45,4 +47,3 @@
 #include <netncp/ncp_rq.h>
 #include <netncp/ncp_nls.h>
 #include <netncp/nwerror.h>
-
--- a/sys/netncp/ncp_mod.c
+++ b/sys/netncp/ncp_mod.c
@ -29,9 +29,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/systm.h>
 #include <sys/conf.h>
--- a/sys/netncp/ncp_ncp.c
+++ b/sys/netncp/ncp_ncp.c
@ -29,11 +29,12 @@
 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 * SUCH DAMAGE.
 *
- * $FreeBSD$
- *
 * Core of NCP protocol
 */

+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/param.h>
 #include <sys/errno.h>
 #include <sys/systm.h>
--- a/sys/netncp/ncp_nls.c
+++ b/sys/netncp/ncp_nls.c
@ -30,9 +30,11 @@
 * SUCH DAMAGE.
 *
 * Character conversion routines
- *
- * $FreeBSD$
 */
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/param.h>
 #include <sys/errno.h>

--- a/sys/netncp/ncp_rq.c
+++ b/sys/netncp/ncp_rq.c
@ -30,9 +30,11 @@
 * SUCH DAMAGE.
 *
 * Routines to prepare request and fetch reply
- *
- * $FreeBSD$
 */ 
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/errno.h>
--- a/sys/netncp/ncp_sock.c
+++ b/sys/netncp/ncp_sock.c
@ -29,11 +29,12 @@
 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 * SUCH DAMAGE.
 *
- * $FreeBSD$
- *
 * Low level socket routines
 */

+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/param.h>
 #include <sys/errno.h>
 #include <sys/lock.h>
--- a/sys/netncp/ncp_subr.c
+++ b/sys/netncp/ncp_subr.c
@ -28,9 +28,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/systm.h>
 #include <sys/errno.h>
--- a/sys/netsmb/smb_conn.c
+++ b/sys/netsmb/smb_conn.c
@ -28,14 +28,15 @@
 * 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$
 */

 /*
 * Connection engine.
 */

+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
--- a/sys/netsmb/smb_crypt.c
+++ b/sys/netsmb/smb_crypt.c
@ -28,9 +28,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/malloc.h>
 #include <sys/kernel.h>
--- a/sys/netsmb/smb_dev.c
+++ b/sys/netsmb/smb_dev.c
@ -28,9 +28,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/kernel.h>
 #include <sys/systm.h>
--- a/sys/netsmb/smb_iod.c
+++ b/sys/netsmb/smb_iod.c
@ -28,9 +28,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 <sys/param.h>
 #include <sys/systm.h>
--- a/sys/netsmb/smb_rq.c
+++ b/sys/netsmb/smb_rq.c
@ -28,9 +28,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/systm.h>
 #include <sys/endian.h>
--- a/sys/netsmb/smb_smb.c
+++ b/sys/netsmb/smb_smb.c
@ -28,12 +28,15 @@
 * 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$
 */
+
 /*
 * various SMB requests. Most of the routines merely packs data into mbufs.
 */
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
--- a/sys/netsmb/smb_subr.c
+++ b/sys/netsmb/smb_subr.c
@ -28,9 +28,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/systm.h>
 #include <sys/endian.h>
--- a/sys/netsmb/smb_trantcp.c
+++ b/sys/netsmb/smb_trantcp.c
@ -28,9 +28,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/condvar.h>
 #include <sys/kernel.h>
--- a/sys/netsmb/smb_usr.c
+++ b/sys/netsmb/smb_usr.c
@ -28,9 +28,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/malloc.h>
 #include <sys/kernel.h>
--- a/sys/nfsclient/nfs_diskless.c
+++ b/sys/nfsclient/nfs_diskless.c
@ -34,9 +34,11 @@
 * SUCH DAMAGE.
 *
 *	from: @(#)autoconf.c	7.1 (Berkeley) 5/9/91
- * $FreeBSD$
 */

+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
--- a/sys/nfsserver/nfs_srvsock.c
+++ b/sys/nfsserver/nfs_srvsock.c
@ -34,7 +34,6 @@
 * SUCH DAMAGE.
 *
 *	@(#)nfs_socket.c	8.5 (Berkeley) 3/30/95
- * $FreeBSD$
 */

 #include <sys/cdefs.h>
--- a/sys/nfsserver/nfs_srvsubs.c
+++ b/sys/nfsserver/nfs_srvsubs.c
@ -34,7 +34,6 @@
 * SUCH DAMAGE.
 *
 *	@(#)nfs_subs.c  8.8 (Berkeley) 5/22/95
- * $FreeBSD$
 */

 #include <sys/cdefs.h>
--- a/sys/nfsserver/nfs_syscalls.c
+++ b/sys/nfsserver/nfs_syscalls.c
@ -34,7 +34,6 @@
 * SUCH DAMAGE.
 *
 *	@(#)nfs_syscalls.c	8.5 (Berkeley) 3/30/95
- * $FreeBSD$
 */

 #include <sys/cdefs.h>