From c7e77b59099de503f20d8b8fd7e07548aef51b0e Mon Sep 17 00:00:00 2001
From: sam <sam@FreeBSD.org>
Date: Fri, 19 Dec 2008 18:45:43 +0000
Subject: [PATCH] add properties and FreeBSD id's

---
 compat/pwcache.c    |  8 +-------
 compat/pwcache.h    |  1 +
 compat/strsuftoll.c |  5 +----
 ffs.c               |  4 +---
 ffs/buf.c           |  4 +---
 ffs/buf.h           |  2 ++
 ffs/ffs_alloc.c     |  4 +---
 ffs/ffs_balloc.c    |  4 +---
 ffs/ffs_bswap.c     |  3 ---
 ffs/ffs_extern.h    |  1 +
 ffs/ffs_subr.c      |  3 ---
 ffs/mkfs.c          | 10 +---------
 ffs/newfs_extern.h  |  2 ++
 ffs/ufs_bmap.c      |  4 +---
 ffs/ufs_bswap.h     |  1 +
 ffs/ufs_inode.h     |  1 +
 getid.c             |  3 +++
 makefs.8            |  2 ++
 makefs.c            |  4 +---
 makefs.h            |  2 ++
 walk.c              |  4 +---
 21 files changed, 25 insertions(+), 47 deletions(-)

diff --git a/compat/pwcache.c b/compat/pwcache.c
index 18e4a29b978f..0579d2692ac5 100644
--- a/compat/pwcache.c
+++ b/compat/pwcache.c
@@ -67,13 +67,7 @@
  */
 
 #include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)cache.c	8.1 (Berkeley) 5/31/93";
-#else
-__RCSID("$NetBSD: pwcache.c,v 1.29 2004/06/20 22:20:14 jmc Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
+__FBSDID("$FreeBSD$");
 
 #include <sys/types.h>
 #include <sys/param.h>
diff --git a/compat/pwcache.h b/compat/pwcache.h
index 3bd651b604ce..17089511b650 100644
--- a/compat/pwcache.h
+++ b/compat/pwcache.h
@@ -33,6 +33,7 @@
  * SUCH DAMAGE.
  *
  *      @(#)cache.h	8.1 (Berkeley) 5/31/93
+ * $FreeBSD$
  */
 
 /*
diff --git a/compat/strsuftoll.c b/compat/strsuftoll.c
index cb796a928a1a..f73e3ad51d23 100644
--- a/compat/strsuftoll.c
+++ b/compat/strsuftoll.c
@@ -68,10 +68,7 @@
  */
 
 #include <sys/cdefs.h>
-
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: strsuftoll.c,v 1.6 2004/03/05 05:58:29 lukem Exp $");
-#endif /* LIBC_SCCS and not lint */
+__FBSDID("$FreeBSD$");
 
 #include <sys/types.h>
 #include <sys/time.h>
diff --git a/ffs.c b/ffs.c
index faf3f8307b18..c9f4fb595426 100644
--- a/ffs.c
+++ b/ffs.c
@@ -66,9 +66,7 @@
  */
 
 #include <sys/cdefs.h>
-#if defined(__RCSID) && !defined(__lint)
-__RCSID("$NetBSD: ffs.c,v 1.30 2004/06/24 22:30:13 lukem Exp $");
-#endif	/* !__lint */
+__FBSDID("$FreeBSD$");
 
 #include <sys/param.h>
 
diff --git a/ffs/buf.c b/ffs/buf.c
index 84825c344d16..08fb6277656f 100644
--- a/ffs/buf.c
+++ b/ffs/buf.c
@@ -36,9 +36,7 @@
  */
 
 #include <sys/cdefs.h>
-#if defined(__RCSID) && !defined(__lint)
-__RCSID("$NetBSD: buf.c,v 1.12 2004/06/20 22:20:18 jmc Exp $");
-#endif	/* !__lint */
+__FBSDID("$FreeBSD$");
 
 #include <sys/param.h>
 #include <sys/time.h>
diff --git a/ffs/buf.h b/ffs/buf.h
index 4b2e4e9d87ad..02c67138e3cc 100644
--- a/ffs/buf.h
+++ b/ffs/buf.h
@@ -33,6 +33,8 @@
  * 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$
  */
 
 #ifndef _FFS_BUF_H
diff --git a/ffs/ffs_alloc.c b/ffs/ffs_alloc.c
index a36bce530fc5..0fe65e6b82e0 100644
--- a/ffs/ffs_alloc.c
+++ b/ffs/ffs_alloc.c
@@ -42,9 +42,7 @@
  */
 
 #include <sys/cdefs.h>
-#if defined(__RCSID) && !defined(__lint)
-__RCSID("$NetBSD: ffs_alloc.c,v 1.14 2004/06/20 22:20:18 jmc Exp $");
-#endif	/* !__lint */
+__FBSDID("$FreeBSD$");
 
 #include <sys/param.h>
 #include <sys/time.h>
diff --git a/ffs/ffs_balloc.c b/ffs/ffs_balloc.c
index fc3c2adc29e3..0a048ad356bd 100644
--- a/ffs/ffs_balloc.c
+++ b/ffs/ffs_balloc.c
@@ -33,9 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-#if defined(__RCSID) && !defined(__lint)
-__RCSID("$NetBSD: ffs_balloc.c,v 1.13 2004/06/20 22:20:18 jmc Exp $");
-#endif	/* !__lint */
+__FBSDID("$FreeBSD$");
 
 #include <sys/param.h>
 #include <sys/time.h>
diff --git a/ffs/ffs_bswap.c b/ffs/ffs_bswap.c
index 5488bbb81f98..d560884f6378 100644
--- a/ffs/ffs_bswap.c
+++ b/ffs/ffs_bswap.c
@@ -31,9 +31,6 @@
  */
 
 #include <sys/cdefs.h>
-#if 0
-__KERNEL_RCSID(0, "$NetBSD: ffs_bswap.c,v 1.28 2004/05/25 14:54:59 hannken Exp $");
-#endif
 __FBSDID("$FreeBSD$");
 
 #include <sys/param.h>
diff --git a/ffs/ffs_extern.h b/ffs/ffs_extern.h
index 53e9fe2ee12f..d95e69bf019d 100644
--- a/ffs/ffs_extern.h
+++ b/ffs/ffs_extern.h
@@ -30,6 +30,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ffs_extern.h	8.6 (Berkeley) 3/30/95
+ * $FreeBSD$
  */
 
 #include "ffs/buf.h"
diff --git a/ffs/ffs_subr.c b/ffs/ffs_subr.c
index 37a20689f3be..5f9b6f2b7dc9 100644
--- a/ffs/ffs_subr.c
+++ b/ffs/ffs_subr.c
@@ -32,9 +32,6 @@
  */
 
 #include <sys/cdefs.h>
-#if 0
-__KERNEL_RCSID(0, "$NetBSD: ffs_subr.c,v 1.32 2003/12/30 12:33:24 pk Exp $");
-#endif
 __FBSDID("$FreeBSD$");
 
 #include <sys/param.h>
diff --git a/ffs/mkfs.c b/ffs/mkfs.c
index bee433d9d084..ce9ec597cea8 100644
--- a/ffs/mkfs.c
+++ b/ffs/mkfs.c
@@ -39,15 +39,7 @@
  */
 
 #include <sys/cdefs.h>
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)mkfs.c	8.11 (Berkeley) 5/3/95";
-#else
-#ifdef __RCSID
-__RCSID("$NetBSD: mkfs.c,v 1.20 2004/06/24 22:30:13 lukem Exp $");
-#endif
-#endif
-#endif /* not lint */
+__FBSDID("$FreeBSD$");
 
 #include <sys/param.h>
 #include <sys/time.h>
diff --git a/ffs/newfs_extern.h b/ffs/newfs_extern.h
index 36c658604378..88559b6011c5 100644
--- a/ffs/newfs_extern.h
+++ b/ffs/newfs_extern.h
@@ -28,6 +28,8 @@
  * 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$
  */
 
 /* prototypes */
diff --git a/ffs/ufs_bmap.c b/ffs/ufs_bmap.c
index cc6ade108b74..85c1d8759743 100644
--- a/ffs/ufs_bmap.c
+++ b/ffs/ufs_bmap.c
@@ -38,9 +38,7 @@
  */
 
 #include <sys/cdefs.h>
-#if defined(__RCSID) && !defined(__lint)
-__RCSID("$NetBSD: ufs_bmap.c,v 1.14 2004/06/20 22:20:18 jmc Exp $");
-#endif	/* !__lint */
+__FBSDID("$FreeBSD$");
 
 #include <sys/param.h>
 #include <sys/time.h>
diff --git a/ffs/ufs_bswap.h b/ffs/ufs_bswap.h
index 344317c4009c..a6b1270969e5 100644
--- a/ffs/ufs_bswap.h
+++ b/ffs/ufs_bswap.h
@@ -28,6 +28,7 @@
  * (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$
  */
 
 #ifndef _UFS_UFS_BSWAP_H_
diff --git a/ffs/ufs_inode.h b/ffs/ufs_inode.h
index 3d61de6e995d..8286f867af56 100644
--- a/ffs/ufs_inode.h
+++ b/ffs/ufs_inode.h
@@ -35,6 +35,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)inode.h	8.9 (Berkeley) 5/14/95
+ * $FreeBSD$
  */
 
 union dinode {
diff --git a/getid.c b/getid.c
index 7c24293a5a24..ca52fa39e46f 100644
--- a/getid.c
+++ b/getid.c
@@ -67,6 +67,9 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/param.h>
 
 #include <grp.h>
diff --git a/makefs.8 b/makefs.8
index 03f61cf5e792..101366ae70be 100644
--- a/makefs.8
+++ b/makefs.8
@@ -33,6 +33,8 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
+.\" $FreeBSD$
+.\"
 .Dd March 30, 2003
 .Dt MAKEFS 8
 .Os
diff --git a/makefs.c b/makefs.c
index 2b4356104bbe..c3e4bd239662 100644
--- a/makefs.c
+++ b/makefs.c
@@ -36,9 +36,7 @@
  */
 
 #include <sys/cdefs.h>
-#if defined(__RCSID) && !defined(__lint)
-__RCSID("$NetBSD: makefs.c,v 1.20 2004/06/20 22:20:18 jmc Exp $");
-#endif	/* !__lint */
+__FBSDID("$FreeBSD$");
 
 #include <assert.h>
 #include <ctype.h>
diff --git a/makefs.h b/makefs.h
index 40414658498f..ce18bf87dfcd 100644
--- a/makefs.h
+++ b/makefs.h
@@ -33,6 +33,8 @@
  * 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$
  */
 
 #ifndef	_MAKEFS_H
diff --git a/walk.c b/walk.c
index f2dc159f835e..e485787063e4 100644
--- a/walk.c
+++ b/walk.c
@@ -72,9 +72,7 @@
  */
 
 #include <sys/cdefs.h>
-#if defined(__RCSID) && !defined(__lint)
-__RCSID("$NetBSD: walk.c,v 1.17 2004/06/20 22:20:18 jmc Exp $");
-#endif	/* !__lint */
+__FBSDID("$FreeBSD$");
 
 #include <sys/param.h>