From: Davidlohr Bueso <dave@gnu.org>
Date: Sun, 24 Jul 2011 14:59:25 +0000 (-0400)
Subject: whereis: remove find()
X-Git-Tag: v2.20-rc1~32
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=839c0259203b7048f6f560abf51dfbd216673d72;p=thirdparty%2Futil-linux.git

whereis: remove find()

Because findv() can do the same job find() does, we can simply remove it and
call findv() with the size of each array.

Signed-off-by: Davidlohr Bueso <dave@gnu.org>
---

diff --git a/misc-utils/whereis.c b/misc-utils/whereis.c
index 4f841f9d1e..a331f45a24 100644
--- a/misc-utils/whereis.c
+++ b/misc-utils/whereis.c
@@ -55,7 +55,6 @@ void looksrc(char *);
 void lookbin(char *);
 void lookman(char *);
 void findv(char **, int, char *);
-void find(char **, char *);
 void findin(char *, char *);
 int itsit(char *, char *);
 
@@ -321,7 +320,7 @@ void
 looksrc(char *cp)
 {
 	if (Sflag == 0)
-		find(srcdirs, cp);
+		findv(srcdirs, ARRAY_SIZE(srcdirs)-1, cp);
 	else
 		findv(Sflag, Scnt, cp);
 }
@@ -330,7 +329,7 @@ void
 lookbin(char *cp)
 {
 	if (Bflag == 0)
-		find(bindirs, cp);
+		findv(bindirs, ARRAY_SIZE(bindirs)-1, cp);
 	else
 		findv(Bflag, Bcnt, cp);
 }
@@ -339,7 +338,7 @@ void
 lookman(char *cp)
 {
 	if (Mflag == 0)
-		find(mandirs, cp);
+		findv(mandirs, ARRAY_SIZE(mandirs)-1, cp);
 	else
 		findv(Mflag, Mcnt, cp);
 }
@@ -351,13 +350,6 @@ findv(char **dirv, int dirc, char *cp)
 		findin(*dirv++, cp), dirc--;
 }
 
-void
-find(char **dirs, char *cp)
-{
-	while (*dirs)
-		findin(*dirs++, cp);
-}
-
 void
 findin(char *dir, char *cp)
 {