SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

basic/glob-util: add closedir wrapper to silence gcc

Browse Source 
../src/test/test-glob-util.c: In function 'test_glob_no_dot':
../src/test/test-glob-util.c:61:32: warning: cast between incompatible function types from 'int (*)(DIR *)' {aka 'int (*)(struct __dirstream *)'} to 'void (*)(void *)' [-Wcast-function-type]
                 .gl_closedir = (void (*)(void *)) closedir,
                                ^
This commit is contained in:
Zbigniew Jędrzejewski-Szmek
2018-02-05 15:20:46 +01:00
parent 24c2c5689d
commit 1fe101747c
2 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/basic/glob-util.c
+5 -1
View File
@@ -29,6 +29,10 @@
#include "path-util.h"
#include "strv.h"
static void _closedir(void* v) {
(void) closedir(v);
}
int safe_glob(const char *path, int flags, glob_t *pglob) {
int k;
@@ -36,7 +40,7 @@ int safe_glob(const char *path, int flags, glob_t *pglob) {
assert(!(flags & GLOB_ALTDIRFUNC));
if (!pglob->gl_closedir)
pglob->gl_closedir = (void (*)(void *)) closedir;
pglob->gl_closedir = _closedir;
if (!pglob->gl_readdir)
pglob->gl_readdir = (struct dirent *(*)(void *)) readdir_no_dot;
if (!pglob->gl_opendir)