[src/trunk]: src/sbin/fsck_lfs rename lfs.h to lfs_user.h so that it does not...

[christos <christos%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/3c6f74e3a162
branches:  trunk
changeset: 584323:3c6f74e3a162
user:      christos <christos%NetBSD.org@localhost>
date:      Tue Sep 13 04:14:17 2005 +0000

description:
rename lfs.h to lfs_user.h so that it does not conflict.

diffstat:

 sbin/fsck_lfs/Makefile    |   6 +-
 sbin/fsck_lfs/dir.c       |   4 +-
 sbin/fsck_lfs/inode.c     |   4 +-
 sbin/fsck_lfs/lfs.c       |   4 +-
 sbin/fsck_lfs/lfs.h       |  93 -----------------------------------------------
 sbin/fsck_lfs/lfs_user.h  |  93 +++++++++++++++++++++++++++++++++++++++++++++++
 sbin/fsck_lfs/pass0.c     |   4 +-
 sbin/fsck_lfs/pass1.c     |   4 +-
 sbin/fsck_lfs/pass2.c     |   4 +-
 sbin/fsck_lfs/pass4.c     |   4 +-
 sbin/fsck_lfs/pass5.c     |   4 +-
 sbin/fsck_lfs/pass6.c     |   4 +-
 sbin/fsck_lfs/segwrite.c  |   4 +-
 sbin/fsck_lfs/setup.c     |   4 +-
 sbin/fsck_lfs/utilities.c |   4 +-
 15 files changed, 120 insertions(+), 120 deletions(-)

diffs (truncated from 432 to 300 lines):

diff -r d453d1a44986 -r 3c6f74e3a162 sbin/fsck_lfs/Makefile
--- a/sbin/fsck_lfs/Makefile    Tue Sep 13 04:13:25 2005 +0000
+++ b/sbin/fsck_lfs/Makefile    Tue Sep 13 04:14:17 2005 +0000
@@ -1,15 +1,15 @@
-#      $NetBSD: Makefile,v 1.10 2005/06/08 19:09:55 perseant Exp $
+#      $NetBSD: Makefile,v 1.11 2005/09/13 04:14:17 christos Exp $
 #      @(#)Makefile    8.1 (Berkeley) 6/5/93
 
 .include <bsd.own.mk>
 
 PROG=  fsck_lfs
 MAN=   fsck_lfs.8
-SRCS=  bufcache.c dir.c fsutil.c inode.c lfs.c lfs_cksum.c main.c
+SRCS=  bufcache.c dir.c fsutil.c inode.c lfs.c lfs_cksum.c lfs_itimes.c main.c
 SRCS+= pass0.c pass1.c pass2.c pass3.c pass4.c pass5.c pass6.c
 SRCS+= segwrite.c setup.c utilities.c vars.c vnode.c
 FSCK=  ${NETBSDSRCDIR}/sbin/fsck
 .PATH: ${NETBSDSRCDIR}/sys/ufs/lfs ${FSCK}
-CPPFLAGS+=-I${FSCK} # -DNDEBUG # -DVERBOSE_BLOCKMAP
+CPPFLAGS+=-I${.CURDIR} -I${FSCK} # -DNDEBUG # -DVERBOSE_BLOCKMAP 
 
 .include <bsd.prog.mk>
diff -r d453d1a44986 -r 3c6f74e3a162 sbin/fsck_lfs/dir.c
--- a/sbin/fsck_lfs/dir.c       Tue Sep 13 04:13:25 2005 +0000
+++ b/sbin/fsck_lfs/dir.c       Tue Sep 13 04:14:17 2005 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: dir.c,v 1.18 2005/08/19 02:07:19 christos Exp $     */
+/* $NetBSD: dir.c,v 1.19 2005/09/13 04:14:17 christos Exp $     */
 
 /*
  * Copyright (c) 1980, 1986, 1993
@@ -47,7 +47,7 @@
 
 #include "bufcache.h"
 #include "vnode.h"
-#include "lfs.h"
+#include "lfs_user.h"
 
 #include "fsck.h"
 #include "fsutil.h"
diff -r d453d1a44986 -r 3c6f74e3a162 sbin/fsck_lfs/inode.c
--- a/sbin/fsck_lfs/inode.c     Tue Sep 13 04:13:25 2005 +0000
+++ b/sbin/fsck_lfs/inode.c     Tue Sep 13 04:14:17 2005 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: inode.c,v 1.30 2005/08/19 02:07:19 christos Exp $   */
+/* $NetBSD: inode.c,v 1.31 2005/09/13 04:14:17 christos Exp $   */
 
 /*-
  * Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -87,7 +87,7 @@
 
 #include "bufcache.h"
 #include "vnode.h"
-#include "lfs.h"
+#include "lfs_user.h"
 
 #include "fsck.h"
 #include "fsutil.h"
diff -r d453d1a44986 -r 3c6f74e3a162 sbin/fsck_lfs/lfs.c
--- a/sbin/fsck_lfs/lfs.c       Tue Sep 13 04:13:25 2005 +0000
+++ b/sbin/fsck_lfs/lfs.c       Tue Sep 13 04:14:17 2005 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: lfs.c,v 1.16 2005/06/08 19:09:55 perseant Exp $ */
+/* $NetBSD: lfs.c,v 1.17 2005/09/13 04:14:17 christos Exp $ */
 /*-
  * Copyright (c) 2003 The NetBSD Foundation, Inc.
  * All rights reserved.
@@ -94,7 +94,7 @@
 
 #include "bufcache.h"
 #include "vnode.h"
-#include "lfs.h"
+#include "lfs_user.h"
 #include "segwrite.h"
 
 #define panic call_panic
diff -r d453d1a44986 -r 3c6f74e3a162 sbin/fsck_lfs/lfs.h
--- a/sbin/fsck_lfs/lfs.h       Tue Sep 13 04:13:25 2005 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,93 +0,0 @@
-/* $NetBSD: lfs.h,v 1.6 2005/06/08 19:09:55 perseant Exp $ */
-/*-
- * Copyright (c) 2003 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Konrad E. Schroder <perseant%hhhh.org@localhost>.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *     This product includes software developed by the NetBSD
- *     Foundation, Inc. and its contributors.
- * 4. Neither the name of The NetBSD Foundation nor the names of its
- *    contributors may be used to endorse or promote products derived
- *    from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY 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.
- */
-
-#include <stdarg.h>
-
-struct lfs;
-struct segsum;
-struct finfo;
-
-/*
- * In the fsck code we don't need lfs_unlockvp, but we don't have a mount
- * structure to give us the devvp.  Overload the unlockvp with devvp.
- */
-#define lfs_devvp lfs_unlockvp
-
-/*
- * This is outside of the kernel, so no locking primitives available.
- */
-#undef simple_lock
-#undef simple_unlock
-
-#define simple_lock(arg)       /* empty */
-#define simple_unlock(arg)     /* empty */
-
-/*
- * Structure used to pass around logical block paths generated by
- * ufs_getlbns and used by truncate and bmap code.
- */
-struct indir {
-       daddr_t in_lbn;         /* Logical block number. */
-       int in_off;             /* Offset in buffer. */
-       int in_exists;          /* Flag if the block exists. */
-};
-
-typedef int32_t ufs_daddr_t;
-
-/* Convert between inode pointers and vnode pointers. */
-#define        VTOI(vp)        ((struct inode *)(vp)->v_data)
-#define VTOD(vp)       (VTOI(vp)->i_din.ffs1_din)
-
-#define sbdirty()      ++fsdirty
-
-extern int fsdirty;
-extern struct uvnodelst vnodelist;
-
-int lfs_vop_strategy(struct ubuf *);
-int lfs_vop_bwrite(struct ubuf *);
-int lfs_vop_bmap(struct uvnode *, daddr_t, daddr_t *);
-
-struct uvnode *lfs_raw_vget(struct lfs *, ino_t, int, ufs_daddr_t);
-struct lfs *lfs_init(int, daddr_t, daddr_t, int, int);
-struct lfs *lfs_verify(struct lfs *, struct lfs *, struct uvnode *, int);
-int check_summary(struct lfs *, struct segsum *, ufs_daddr_t, int, struct uvnode *, void (*)(ufs_daddr_t, struct finfo *));
-ufs_daddr_t try_verify(struct lfs *, struct uvnode *, ufs_daddr_t, int);
-struct ufs1_dinode *lfs_ifind(struct lfs *, ino_t, struct ubuf *);
-void call_panic(const char *, ...);
-void my_vpanic(int, const char *, va_list);
-int extend_ifile(struct lfs *);
-struct uvnode *lfs_valloc(struct lfs *, ino_t);
diff -r d453d1a44986 -r 3c6f74e3a162 sbin/fsck_lfs/lfs_user.h
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sbin/fsck_lfs/lfs_user.h  Tue Sep 13 04:14:17 2005 +0000
@@ -0,0 +1,93 @@
+/* $NetBSD: lfs_user.h,v 1.1 2005/09/13 04:14:17 christos Exp $ */
+/*-
+ * Copyright (c) 2003 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Konrad E. Schroder <perseant%hhhh.org@localhost>.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *     This product includes software developed by the NetBSD
+ *     Foundation, Inc. and its contributors.
+ * 4. Neither the name of The NetBSD Foundation nor the names of its
+ *    contributors may be used to endorse or promote products derived
+ *    from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY 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.
+ */
+
+#include <stdarg.h>
+
+struct lfs;
+struct segsum;
+struct finfo;
+
+/*
+ * In the fsck code we don't need lfs_unlockvp, but we don't have a mount
+ * structure to give us the devvp.  Overload the unlockvp with devvp.
+ */
+#define lfs_devvp lfs_unlockvp
+
+/*
+ * This is outside of the kernel, so no locking primitives available.
+ */
+#undef simple_lock
+#undef simple_unlock
+
+#define simple_lock(arg)       /* empty */
+#define simple_unlock(arg)     /* empty */
+
+/*
+ * Structure used to pass around logical block paths generated by
+ * ufs_getlbns and used by truncate and bmap code.
+ */
+struct indir {
+       daddr_t in_lbn;         /* Logical block number. */
+       int in_off;             /* Offset in buffer. */
+       int in_exists;          /* Flag if the block exists. */
+};
+
+typedef int32_t ufs_daddr_t;
+
+/* Convert between inode pointers and vnode pointers. */
+#define        VTOI(vp)        ((struct inode *)(vp)->v_data)
+#define VTOD(vp)       (VTOI(vp)->i_din.ffs1_din)
+
+#define sbdirty()      ++fsdirty
+
+extern int fsdirty;
+extern struct uvnodelst vnodelist;
+
+int lfs_vop_strategy(struct ubuf *);
+int lfs_vop_bwrite(struct ubuf *);
+int lfs_vop_bmap(struct uvnode *, daddr_t, daddr_t *);
+
+struct uvnode *lfs_raw_vget(struct lfs *, ino_t, int, ufs_daddr_t);
+struct lfs *lfs_init(int, daddr_t, daddr_t, int, int);
+struct lfs *lfs_verify(struct lfs *, struct lfs *, struct uvnode *, int);
+int check_summary(struct lfs *, struct segsum *, ufs_daddr_t, int, struct uvnode *, void (*)(ufs_daddr_t, struct finfo *));
+ufs_daddr_t try_verify(struct lfs *, struct uvnode *, ufs_daddr_t, int);
+struct ufs1_dinode *lfs_ifind(struct lfs *, ino_t, struct ubuf *);
+void call_panic(const char *, ...);
+void my_vpanic(int, const char *, va_list);
+int extend_ifile(struct lfs *);
+struct uvnode *lfs_valloc(struct lfs *, ino_t);
diff -r d453d1a44986 -r 3c6f74e3a162 sbin/fsck_lfs/pass0.c
--- a/sbin/fsck_lfs/pass0.c     Tue Sep 13 04:13:25 2005 +0000
+++ b/sbin/fsck_lfs/pass0.c     Tue Sep 13 04:14:17 2005 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: pass0.c,v 1.23 2005/08/20 14:59:20 kent Exp $       */
+/* $NetBSD: pass0.c,v 1.24 2005/09/13 04:14:17 christos Exp $   */
 
 /*-
  * Copyright (c) 1999, 2000, 2001, 2002, 2003 The NetBSD Foundation, Inc.
@@ -82,7 +82,7 @@
 
 #include "bufcache.h"
 #include "vnode.h"
-#include "lfs.h"
+#include "lfs_user.h"
 
 #include "fsck.h"
 #include "extern.h"
diff -r d453d1a44986 -r 3c6f74e3a162 sbin/fsck_lfs/pass1.c
--- a/sbin/fsck_lfs/pass1.c     Tue Sep 13 04:13:25 2005 +0000
+++ b/sbin/fsck_lfs/pass1.c     Tue Sep 13 04:14:17 2005 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: pass1.c,v 1.22 2005/08/19 02:07:19 christos Exp $   */
+/* $NetBSD: pass1.c,v 1.23 2005/09/13 04:14:17 christos Exp $   */
 
 /*
  * Copyright (c) 1980, 1986, 1993
@@ -49,7 +49,7 @@
 
 #include "bufcache.h"