From fa81a9761dd7e03557d20c88d3e5343db0db096e Mon Sep 17 00:00:00 2001
From: Matthew Dillon <dillon@FreeBSD.org>
Date: Sun, 30 Sep 2001 22:39:00 +0000
Subject: [PATCH] Add huff __FBSDID()s puff to whew! libz

---
 lib/libz/adler32.c  | 3 ++-
 lib/libz/compress.c | 3 ++-
 lib/libz/crc32.c    | 3 ++-
 lib/libz/deflate.c  | 3 +++
 lib/libz/example.c  | 3 ++-
 lib/libz/gzio.c     | 3 ++-
 lib/libz/infblock.c | 3 +++
 lib/libz/infcodes.c | 3 +++
 lib/libz/inffast.c  | 3 +++
 lib/libz/inflate.c  | 3 +++
 lib/libz/inftrees.c | 3 +++
 lib/libz/infutil.c  | 3 +++
 lib/libz/maketree.c | 3 +++
 lib/libz/minigzip.c | 3 ++-
 lib/libz/trees.c    | 3 ++-
 lib/libz/uncompr.c  | 3 ++-
 lib/libz/zopen.c    | 6 ++----
 lib/libz/zutil.c    | 3 ++-
 18 files changed, 44 insertions(+), 13 deletions(-)

diff --git a/lib/libz/adler32.c b/lib/libz/adler32.c
index 8d42f875a8f9..5af4ea3f8ddf 100644
--- a/lib/libz/adler32.c
+++ b/lib/libz/adler32.c
@@ -3,7 +3,8 @@
  * For conditions of distribution and use, see copyright notice in zlib.h 
  */
 
-/* @(#) $FreeBSD$ */
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 #include "zlib.h"
 
diff --git a/lib/libz/compress.c b/lib/libz/compress.c
index 4ff6bc1e7f09..9db5703ab96d 100644
--- a/lib/libz/compress.c
+++ b/lib/libz/compress.c
@@ -3,7 +3,8 @@
  * For conditions of distribution and use, see copyright notice in zlib.h 
  */
 
-/* @(#) $FreeBSD$ */
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 #include "zlib.h"
 
diff --git a/lib/libz/crc32.c b/lib/libz/crc32.c
index 3f8ce1df5ff8..32ea0ebff9d4 100644
--- a/lib/libz/crc32.c
+++ b/lib/libz/crc32.c
@@ -3,7 +3,8 @@
  * For conditions of distribution and use, see copyright notice in zlib.h 
  */
 
-/* @(#) $FreeBSD$ */
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 #include "zlib.h"
 
diff --git a/lib/libz/deflate.c b/lib/libz/deflate.c
index 10bb235fa16b..57fbe9ab01d1 100644
--- a/lib/libz/deflate.c
+++ b/lib/libz/deflate.c
@@ -3,6 +3,9 @@
  * For conditions of distribution and use, see copyright notice in zlib.h 
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 /*
  *  ALGORITHM
  *
diff --git a/lib/libz/example.c b/lib/libz/example.c
index 045751f3c19e..8c8cdfb10eae 100644
--- a/lib/libz/example.c
+++ b/lib/libz/example.c
@@ -3,7 +3,8 @@
  * For conditions of distribution and use, see copyright notice in zlib.h 
  */
 
-/* @(#) $FreeBSD$ */
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 #include <stdio.h>
 #include "zlib.h"
diff --git a/lib/libz/gzio.c b/lib/libz/gzio.c
index 8e7940081a6d..abefdc72d229 100644
--- a/lib/libz/gzio.c
+++ b/lib/libz/gzio.c
@@ -5,7 +5,8 @@
  * Compile this file with -DNO_DEFLATE to avoid the compression code.
  */
 
-/* @(#) $FreeBSD$ */
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 #include <stdio.h>
 
diff --git a/lib/libz/infblock.c b/lib/libz/infblock.c
index f4920faa5ea0..c46858c8a239 100644
--- a/lib/libz/infblock.c
+++ b/lib/libz/infblock.c
@@ -3,6 +3,9 @@
  * For conditions of distribution and use, see copyright notice in zlib.h 
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include "zutil.h"
 #include "infblock.h"
 #include "inftrees.h"
diff --git a/lib/libz/infcodes.c b/lib/libz/infcodes.c
index d4e5ee9a5543..7711cf8c92d5 100644
--- a/lib/libz/infcodes.c
+++ b/lib/libz/infcodes.c
@@ -3,6 +3,9 @@
  * For conditions of distribution and use, see copyright notice in zlib.h 
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include "zutil.h"
 #include "inftrees.h"
 #include "infblock.h"
diff --git a/lib/libz/inffast.c b/lib/libz/inffast.c
index 61a78ee933fc..0f1471a927c5 100644
--- a/lib/libz/inffast.c
+++ b/lib/libz/inffast.c
@@ -3,6 +3,9 @@
  * For conditions of distribution and use, see copyright notice in zlib.h 
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include "zutil.h"
 #include "inftrees.h"
 #include "infblock.h"
diff --git a/lib/libz/inflate.c b/lib/libz/inflate.c
index 32e9b8de6797..565a64cb0fd2 100644
--- a/lib/libz/inflate.c
+++ b/lib/libz/inflate.c
@@ -3,6 +3,9 @@
  * For conditions of distribution and use, see copyright notice in zlib.h 
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include "zutil.h"
 #include "infblock.h"
 
diff --git a/lib/libz/inftrees.c b/lib/libz/inftrees.c
index ef1e0b6b8732..9ed0316bb574 100644
--- a/lib/libz/inftrees.c
+++ b/lib/libz/inftrees.c
@@ -3,6 +3,9 @@
  * For conditions of distribution and use, see copyright notice in zlib.h 
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include "zutil.h"
 #include "inftrees.h"
 
diff --git a/lib/libz/infutil.c b/lib/libz/infutil.c
index 824dab571284..7461404b6d77 100644
--- a/lib/libz/infutil.c
+++ b/lib/libz/infutil.c
@@ -3,6 +3,9 @@
  * For conditions of distribution and use, see copyright notice in zlib.h 
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include "zutil.h"
 #include "infblock.h"
 #include "inftrees.h"
diff --git a/lib/libz/maketree.c b/lib/libz/maketree.c
index 949d78641851..57a35356f8d3 100644
--- a/lib/libz/maketree.c
+++ b/lib/libz/maketree.c
@@ -3,6 +3,9 @@
  * For conditions of distribution and use, see copyright notice in zlib.h 
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 /* WARNING: this file should *not* be used by applications. It is
    part of the implementation of the compression library and is
    subject to change. Applications should only use zlib.h.
diff --git a/lib/libz/minigzip.c b/lib/libz/minigzip.c
index 7c7246415358..cd7e2de95bd4 100644
--- a/lib/libz/minigzip.c
+++ b/lib/libz/minigzip.c
@@ -13,7 +13,8 @@
  * or in pipe mode.
  */
 
-/* @(#) $FreeBSD$ */
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 #include <stdio.h>
 #include "zlib.h"
diff --git a/lib/libz/trees.c b/lib/libz/trees.c
index bd7044012cfa..116d9f640c8b 100644
--- a/lib/libz/trees.c
+++ b/lib/libz/trees.c
@@ -29,7 +29,8 @@
  *          Addison-Wesley, 1983. ISBN 0-201-06672-6.
  */
 
-/* @(#) $FreeBSD$ */
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 /* #define GEN_TREES_H */
 
diff --git a/lib/libz/uncompr.c b/lib/libz/uncompr.c
index 25472c0f94c7..18be3b8a2162 100644
--- a/lib/libz/uncompr.c
+++ b/lib/libz/uncompr.c
@@ -3,7 +3,8 @@
  * For conditions of distribution and use, see copyright notice in zlib.h 
  */
 
-/* @(#) $FreeBSD$ */
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 #include "zlib.h"
 
diff --git a/lib/libz/zopen.c b/lib/libz/zopen.c
index 33e6c7619a18..025899f0dc05 100644
--- a/lib/libz/zopen.c
+++ b/lib/libz/zopen.c
@@ -2,10 +2,8 @@
  * Public domain stdio wrapper for libz, written by Johan Danielsson.
  */
 
-#ifndef lint
-static const char rcsid[] = 
-  "$FreeBSD$";
-#endif /* not lint */
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 #include <stdio.h>
 #include <zlib.h>
diff --git a/lib/libz/zutil.c b/lib/libz/zutil.c
index 8419dbcdab34..64a2a57735ab 100644
--- a/lib/libz/zutil.c
+++ b/lib/libz/zutil.c
@@ -3,7 +3,8 @@
  * For conditions of distribution and use, see copyright notice in zlib.h 
  */
 
-/* @(#) $FreeBSD$ */
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 #include "zutil.h"