[src/netbsd-1-4]: src/sbin/fsck_lfs Pull up revision 1.4 (requested by persea...

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

details:   https://anonhg.NetBSD.org/src/rev/11fecd2e59c4
branches:  netbsd-1-4
changeset: 470142:11fecd2e59c4
user:      he <he%NetBSD.org@localhost>
date:      Fri Jan 21 00:34:56 2000 +0000

description:
Pull up revision 1.4 (requested by perseant):
  Fix name collision error due to recent kernel prototype updates.
  Fixes PR#9253.

diffstat:

 sbin/fsck_lfs/inode.c |  12 ++++++------
 sbin/fsck_lfs/pass1.c |   4 ++--
 2 files changed, 8 insertions(+), 8 deletions(-)

diffs (71 lines):

diff -r 9aa08794ed45 -r 11fecd2e59c4 sbin/fsck_lfs/inode.c
--- a/sbin/fsck_lfs/inode.c     Fri Jan 21 00:34:32 2000 +0000
+++ b/sbin/fsck_lfs/inode.c     Fri Jan 21 00:34:56 2000 +0000
@@ -1,4 +1,4 @@
-/*     $Id: inode.c,v 1.2 1999/03/24 05:32:23 nathanw Exp $    */
+/*     $Id: inode.c,v 1.2.2.1 2000/01/21 00:34:56 he Exp $     */
 
 /*
  * Copyright (c) 1997, 1998
@@ -64,14 +64,14 @@
 /* stolen from lfs_inode.c */
 /* Search a block for a specific dinode. */
 struct dinode *
-lfs_ifind(struct lfs *fs, ino_t ino, struct dinode *dip)
+lfs_difind(struct lfs *fs, ino_t ino, struct dinode *dip)
 {
     register int cnt;
 
     for(cnt=0;cnt<INOPB(fs);cnt++)
         if(dip[cnt].di_inumber == ino)
             return &(dip[cnt]);
-    /* printf("lfs_ifind: dinode %u not found\n", ino); */
+    /* printf("lfs_difind: dinode %u not found\n", ino); */
     return NULL;
 }
 
@@ -210,7 +210,7 @@
 #if 1
     struct dinode *idinode;
 
-    idinode = lfs_ifind(&sblock,sblock.lfs_ifile,&ifblock);
+    idinode = lfs_difind(&sblock,sblock.lfs_ifile,&ifblock);
     return ((idinode->di_size
             - (sblock.lfs_cleansz + sblock.lfs_segtabsz) * sblock.lfs_bsize)
         / sblock.lfs_bsize) * sblock.lfs_ifpb - 1;
@@ -224,7 +224,7 @@
     static struct dinode *idinode;
 
     if(!idinode) {              /* only need to do this once */
-        idinode = lfs_ifind(&sblock,sblock.lfs_ifile,&ifblock);
+        idinode = lfs_difind(&sblock,sblock.lfs_ifile,&ifblock);
         if(din_table[LFS_IFILE_INUM]
            && din_table[LFS_IFILE_INUM]->di_gen > idinode->di_gen) {
             printf("XXX replacing IFILE gen %d with gen %d\n",
@@ -301,7 +301,7 @@
                ifp->if_daddr, datosn(&sblock,ifp->if_daddr));
     }
     pbp = getddblk(ifp->if_daddr,sblock.lfs_bsize);
-    din=lfs_ifind(&sblock, inumber, pbp->b_un.b_dinode);
+    din=lfs_difind(&sblock, inumber, pbp->b_un.b_dinode);
 
     /* debug */
     if(din && din->di_inumber != inumber)
diff -r 9aa08794ed45 -r 11fecd2e59c4 sbin/fsck_lfs/pass1.c
--- a/sbin/fsck_lfs/pass1.c     Fri Jan 21 00:34:32 2000 +0000
+++ b/sbin/fsck_lfs/pass1.c     Fri Jan 21 00:34:56 2000 +0000
@@ -1,4 +1,4 @@
-/*     $Id: pass1.c,v 1.2 1999/03/24 05:32:23 nathanw Exp $    */
+/*     $Id: pass1.c,v 1.2.2.1 2000/01/21 00:34:57 he Exp $     */
 
 /*
  * Copyright (c) 1980, 1986, 1993
@@ -77,7 +77,7 @@
         struct ifile *ifp;
         CLEANERINFO *cp;
 
-        idinode = lfs_ifind(&sblock,sblock.lfs_ifile,&ifblock);
+        idinode = lfs_difind(&sblock,sblock.lfs_ifile,&ifblock);
 
         /*
          * We now have the ifile's inode block in core.  Read out the