summaryrefslogtreecommitdiffstats
path: root/misc-utils/whereis.c
diff options
context:
space:
mode:
authorDavidlohr Bueso2011-07-24 16:59:25 +0200
committerKarel Zak2011-07-26 11:58:38 +0200
commit839c0259203b7048f6f560abf51dfbd216673d72 (patch)
treeb97cc306ae1cdecca54a4b064e70c669e694e6a2 /misc-utils/whereis.c
parentlscpu: use xalloc (diff)
downloadkernel-qcow2-util-linux-839c0259203b7048f6f560abf51dfbd216673d72.tar.gz
kernel-qcow2-util-linux-839c0259203b7048f6f560abf51dfbd216673d72.tar.xz
kernel-qcow2-util-linux-839c0259203b7048f6f560abf51dfbd216673d72.zip
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>
Diffstat (limited to 'misc-utils/whereis.c')
-rw-r--r--misc-utils/whereis.c14
1 files changed, 3 insertions, 11 deletions
diff --git a/misc-utils/whereis.c b/misc-utils/whereis.c
index 4f841f9d1..a331f45a2 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);
}
@@ -352,13 +351,6 @@ findv(char **dirv, int dirc, char *cp)
}
void
-find(char **dirs, char *cp)
-{
- while (*dirs)
- findin(*dirs++, cp);
-}
-
-void
findin(char *dir, char *cp)
{
DIR *dirp;