basic/glob-util: do not use names with "_" prefix

keszybz · keszybz · commit 46dcfbbdb6f0 · 2018-03-05T09:04:39.000+01:00
Names starting with _ or __ are reserved by the standard, better to
avoid them.
diff --git a/src/basic/glob-util.c b/src/basic/glob-util.c
@@ -29,7 +29,7 @@
 #include "path-util.h"
 #include "strv.h"
 
-static void _closedir(void* v) {
+static void closedir_wrapper(void* v) {
         (void) closedir(v);
 }
 
@@ -40,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 = _closedir;
+                pglob->gl_closedir = closedir_wrapper;
         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
@@ -49,7 +49,7 @@ static void test_glob_exists(void) {
         assert_se(r == 0);
 }
 
-static void _closedir(void* v) {
+static void closedir_wrapper(void* v) {
         (void) closedir(v);
 }
 
@@ -58,7 +58,7 @@ static void test_glob_no_dot(void) {
         const char *fn;
 
         _cleanup_globfree_ glob_t g = {
-                .gl_closedir = _closedir,
+                .gl_closedir = closedir_wrapper,
                 .gl_readdir = (struct dirent *(*)(void *)) readdir_no_dot,
                 .gl_opendir = (void *(*)(const char *)) opendir,
                 .gl_lstat = lstat,

Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ static void test_glob_exists(void) {`
`49`	`49`	`assert_se(r == 0);`
`50`	`50`	`}`
`51`	`51`
`52`		`-static void _closedir(void* v) {`
	`52`	`+static void closedir_wrapper(void* v) {`
`53`	`53`	`(void) closedir(v);`
`54`	`54`	`}`
`55`	`55`
`@@ -58,7 +58,7 @@ static void test_glob_no_dot(void) {`
`58`	`58`	`const char *fn;`
`59`	`59`
`60`	`60`	`_cleanup_globfree_ glob_t g = {`
`61`		`- .gl_closedir = _closedir,`
	`61`	`+ .gl_closedir = closedir_wrapper,`
`62`	`62`	`.gl_readdir = (struct dirent ()(void *)) readdir_no_dot,`
`63`	`63`	`.gl_opendir = (void ()(const char *)) opendir,`
`64`	`64`	`.gl_lstat = lstat,`