From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Mon, 5 Feb 2018 09:55:24 +0000 (+0100)
Subject: basic/glob-util: add closedir wrapper to silence gcc
X-Git-Tag: v238~141^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1fe101747cb8dcef8c9444bdec4da77930ceaf36;p=thirdparty%2Fsystemd.git

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

../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,
                                ^
---

diff --git a/src/basic/glob-util.c b/src/basic/glob-util.c
index 6e80a1e23b5..a6ba9ef1634 100644
--- a/src/basic/glob-util.c
+++ b/src/basic/glob-util.c
@@ -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)
diff --git a/src/test/test-glob-util.c b/src/test/test-glob-util.c
index bd2f8fcfde6..ab40a2a4bee 100644
--- a/src/test/test-glob-util.c
+++ b/src/test/test-glob-util.c
@@ -49,12 +49,16 @@ static void test_glob_exists(void) {
         assert_se(r == 0);
 }
 
+static void _closedir(void* v) {
+        (void) closedir(v);
+}
+
 static void test_glob_no_dot(void) {
         char template[] = "/tmp/test-glob-util.XXXXXXX";
         const char *fn;
 
         _cleanup_globfree_ glob_t g = {
-                .gl_closedir = (void (*)(void *)) closedir,
+                .gl_closedir = _closedir,
                 .gl_readdir = (struct dirent *(*)(void *)) readdir_no_dot,
                 .gl_opendir = (void *(*)(const char *)) opendir,
                 .gl_lstat = lstat,