diff options
| author | Ben Lindstrom <mouring@eviladmin.org> | 2003-08-25 03:10:51 +0200 |
|---|---|---|
| committer | Ben Lindstrom <mouring@eviladmin.org> | 2003-08-25 03:10:51 +0200 |
| commit | af4a6c3a5619299a16cfbb545cde110849596204 (patch) | |
| tree | 4145a5d683ef920d9c1068c09d028e1ce5a73d96 /openbsd-compat/glob.c | |
| parent | - (djm) Bug #621: Select OpenSC keys by usage attributes. Patch from (diff) | |
| download | openssh-af4a6c3a5619299a16cfbb545cde110849596204.tar.xz openssh-af4a6c3a5619299a16cfbb545cde110849596204.zip | |
- (bal) openbsd-compat/ OpenBSD updates. Mostly licensing, ansifications
and minor fixes.
Diffstat (limited to 'openbsd-compat/glob.c')
| -rw-r--r-- | openbsd-compat/glob.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/openbsd-compat/glob.c b/openbsd-compat/glob.c index 2ba56e003..50f35c304 100644 --- a/openbsd-compat/glob.c +++ b/openbsd-compat/glob.c @@ -52,7 +52,7 @@ get_arg_max(void) #if 0 static char sccsid[] = "@(#)glob.c 8.3 (Berkeley) 10/13/93"; #else -static char rcsid[] = "$OpenBSD: glob.c,v 1.21 2003/06/02 20:18:34 millert Exp $"; +static char rcsid[] = "$OpenBSD: glob.c,v 1.22 2003/06/25 21:16:47 deraadt Exp $"; #endif #endif /* LIBC_SCCS and not lint */ @@ -611,7 +611,7 @@ glob3(pathbuf, pathbuf_last, pathend, pathend_last, pattern, pattern_last, * and dirent.h as taking pointers to differently typed opaque * structures. */ - struct dirent *(*readdirfunc)(); + struct dirent *(*readdirfunc)(void *); if (pathend > pathend_last) return (1); @@ -636,7 +636,7 @@ glob3(pathbuf, pathbuf_last, pathend, pathend_last, pattern, pattern_last, if (pglob->gl_flags & GLOB_ALTDIRFUNC) readdirfunc = pglob->gl_readdir; else - readdirfunc = readdir; + readdirfunc = (struct dirent *(*)(void *))readdir; while ((dp = (*readdirfunc)(dirp))) { register u_char *sc; register Char *dc; |