summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2018-03-05 09:04:39 +0100
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2018-03-05 09:04:39 +0100
commit46dcfbbdb6f02ab5ebf09c73517903e2ae2d2874 (patch)
treed6fc135be8aebdfa6d1a982335a9cd8d32d80d23
parent04b9d5f975f59b944bcd982414289d01f957faa9 (diff)
downloadsystemd-46dcfbbdb6f02ab5ebf09c73517903e2ae2d2874.tar.gz
basic/glob-util: do not use names with "_" prefix
Names starting with _ or __ are reserved by the standard, better to avoid them.
-rw-r--r--src/basic/glob-util.c4
-rw-r--r--src/test/test-glob-util.c4
2 files changed, 4 insertions, 4 deletions
diff --git a/src/basic/glob-util.c b/src/basic/glob-util.c
index a6ba9ef163..4ac56c91d0 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 ab40a2a4be..a30e04016f 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,