diff options
| author | rodrigc <rodrigc@FreeBSD.org> | 2015-09-22 07:40:55 +0000 |
|---|---|---|
| committer | rodrigc <rodrigc@FreeBSD.org> | 2015-09-22 07:40:55 +0000 |
| commit | ff5d08b0317ab85d564fa4ed529fe7fea07bded1 (patch) | |
| tree | 1a8409e32f2be1f3e690252fe2662c30d9bcf36e /lib/libc | |
| parent | dc4550e7b28dce2085ad8b0bbbb34a3c4dc4aa7b (diff) | |
| download | FreeBSD-src-ff5d08b0317ab85d564fa4ed529fe7fea07bded1.zip FreeBSD-src-ff5d08b0317ab85d564fa4ed529fe7fea07bded1.tar.gz | |
Use proper function prototype for readdir().
Eliminates -Wstrict-prototypes warning
Submitted by: Joerg Sonnenberger <joerg@dragonflybsd.org>
Obtained from: DragonFlyBSD (commit 2a6aec8dab58c89961cabcfdb92e0d0ae256dea4)
Diffstat (limited to 'lib/libc')
| -rw-r--r-- | lib/libc/gen/glob.c | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/lib/libc/gen/glob.c b/lib/libc/gen/glob.c index 95a3a06..971d616 100644 --- a/lib/libc/gen/glob.c +++ b/lib/libc/gen/glob.c @@ -650,13 +650,7 @@ glob3(Char *pathbuf, Char *pathend, Char *pathend_last, int err; char buf[MAXPATHLEN]; - /* - * The readdirfunc declaration can't be prototyped, because it is - * assigned, below, to two functions which are prototyped in glob.h - * and dirent.h as taking pointers to differently typed opaque - * structures. - */ - struct dirent *(*readdirfunc)(); + struct dirent *(*readdirfunc)(DIR *); if (pathend > pathend_last) return (GLOB_ABORTED); @@ -677,12 +671,14 @@ glob3(Char *pathbuf, Char *pathend, Char *pathend_last, err = 0; - /* Search directory for matching names. */ + /* pglob->gl_readdir takes a void *, fix this manually */ if (pglob->gl_flags & GLOB_ALTDIRFUNC) - readdirfunc = pglob->gl_readdir; + readdirfunc = (struct dirent *(*)(DIR *))pglob->gl_readdir; else readdirfunc = readdir; - while ((dp = (*readdirfunc)(dirp))) { + + /* Search directory for matching names. */ + while ((dp = (*readdirfunc)(dirp)) != NULL) { char *sc; Char *dc; wchar_t wc; |
