From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Mon, 5 Mar 2018 08:04:39 +0000 (+0100)
Subject: basic/glob-util: do not use names with "_" prefix
X-Git-Tag: v238~4^2~2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=46dcfbbdb6f02ab5ebf09c73517903e2ae2d2874;p=thirdparty%2Fsystemd.git

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

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
index a6ba9ef1634..4ac56c91d09 100644
--- 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
index ab40a2a4bee..a30e04016fe 100644
--- 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,