morgan/systemd
1
0
Fork 0
mirror of https://github.com/morgan9e/systemd synced 2026-04-15 00:47:10 +09:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Names starting with _ or __ are reserved by the standard, better to
avoid them.
This commit is contained in:
Zbigniew Jędrzejewski-Szmek
2018-03-05 09:04:39 +01:00
parent 04b9d5f975
commit 46dcfbbdb6
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/basic/glob-util.c
View File

@@ -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)

4
src/test/test-glob-util.c
View File

@@ -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,