[src/trunk]: src/sbin/fsck_lfs Rename lfs_ifind so that it does not conflict ...

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

details:   https://anonhg.NetBSD.org/src/rev/9974bf56e18e
branches:  trunk
changeset: 480814:9974bf56e18e
user:      perseant <perseant%NetBSD.org@localhost>
date:      Thu Jan 20 21:32:31 2000 +0000

description:
Rename lfs_ifind so that it does not conflict with new kernel prototype.
Addresses PR #9253.

diffstat:

 sbin/fsck_lfs/fsck.h  |   5 ++---
 sbin/fsck_lfs/inode.c |  12 ++++++------
 sbin/fsck_lfs/pass1.c |   4 ++--
 3 files changed, 10 insertions(+), 11 deletions(-)

diffs (90 lines):

diff -r a2826173f31c -r 9974bf56e18e sbin/fsck_lfs/fsck.h
--- a/sbin/fsck_lfs/fsck.h      Thu Jan 20 19:27:03 2000 +0000
+++ b/sbin/fsck_lfs/fsck.h      Thu Jan 20 21:32:31 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: fsck.h,v 1.2 1999/07/03 19:55:03 kleink Exp $  */
+/*     $NetBSD: fsck.h,v 1.3 2000/01/20 21:32:31 perseant Exp $        */
 
 /*
  * Copyright (c) 1997
@@ -211,8 +211,7 @@
 struct bufarea *lfs_bginode __P((ino_t));
 struct dinode *ginode __P((ino_t));
 struct dinode *lfs_ginode __P((ino_t));
-struct dinode *lfs_ifind __P((struct lfs *, ino_t, struct dinode *));
-struct dinode *lfs_ifind __P((struct lfs *, ino_t, struct dinode *));
+struct dinode *lfs_difind __P((struct lfs *, ino_t, struct dinode *));
 struct ifile *lfs_ientry __P((ino_t));
 struct inoinfo *getinoinfo __P((ino_t));
 void getblk __P((struct bufarea *, daddr_t, long));
diff -r a2826173f31c -r 9974bf56e18e sbin/fsck_lfs/inode.c
--- a/sbin/fsck_lfs/inode.c     Thu Jan 20 19:27:03 2000 +0000
+++ b/sbin/fsck_lfs/inode.c     Thu Jan 20 21:32:31 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: inode.c,v 1.3 1999/07/03 19:55:03 kleink Exp $ */
+/*     $NetBSD: inode.c,v 1.4 2000/01/20 21:32:31 perseant 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 a2826173f31c -r 9974bf56e18e sbin/fsck_lfs/pass1.c
--- a/sbin/fsck_lfs/pass1.c     Thu Jan 20 19:27:03 2000 +0000
+++ b/sbin/fsck_lfs/pass1.c     Thu Jan 20 21:32:31 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pass1.c,v 1.3 1999/07/03 19:55:03 kleink Exp $ */
+/*     $NetBSD: pass1.c,v 1.4 2000/01/20 21:32:32 perseant 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