SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

defs: rework CONF_DIRS_NULSTR() macro

Browse Source 
The macro is generically useful for putting together search paths, hence
let's make it truly generic, by dropping the implicit ".d" appending it
does, and leave that to the caller. Also rename it from
CONF_DIRS_NULSTR() to CONF_PATHS_NULSTR(), since it's not strictly about
dirs that way, but any kind of file system path.

Also, mark CONF_DIR_SPLIT_USR() as internal macro by renaming it to
_CONF_PATHS_SPLIT_USR() so that the leading underscore indicates that
it's internal.
This commit is contained in:
Lennart Poettering
2015-11-10 17:31:31 +01:00
parent b1f044bbc4
commit 75eb615480
16 changed files with 41 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules-load/modules-load.c
+1 -1
View File
@@ -38,7 +38,7 @@
static char **arg_proc_cmdline_modules = NULL;
static const char conf_file_dirs[] = CONF_DIRS_NULSTR("modules-load");
static const char conf_file_dirs[] = CONF_PATHS_NULSTR("modules-load.d");
static void systemd_kmod_log(void *data, int priority, const char *file, int line,
const char *fn, const char *format, va_list args) {