From 46dcfbbdb6f02ab5ebf09c73517903e2ae2d2874 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Mon, 5 Mar 2018 09:04:39 +0100 Subject: [PATCH] basic/glob-util: do not use names with "_" prefix Names starting with _ or __ are reserved by the standard, better to avoid them. --- src/basic/glob-util.c | 4 ++-- src/test/test-glob-util.c | 4 ++-- 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,