picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Eliminate config_dirs vars which hold a static strv

Browse source
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2018-04-27 18:20:17 +02:00
parent 971f6ea551
commit a826d4f7d0
3 changed files with 7 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/binfmt/binfmt.c
View file

@ -24,7 +24,6 @@
#include "terminal-util.h"
#include "util.h"
static char **config_dirs = CONF_PATHS_STRV("binfmt.d");
static bool arg_cat_config = false;
static int delete_rule(const char *rule) {
@ -65,7 +64,7 @@ static int apply_file(const char *path, bool ignore_enoent) {
assert(path);
r = search_and_fopen(path, "re", NULL, (const char**) config_dirs, &f);
r = search_and_fopen(path, "re", NULL, (const char**) CONF_PATHS_STRV("binfmt.d"), &f);
if (r < 0) {
if (ignore_enoent && r == -ENOENT)
return 0;
@ -184,7 +183,7 @@ int main(int argc, char *argv[]) {
_cleanup_strv_free_ char **files = NULL;
char **f;
r = conf_files_list_strv(&files, ".conf", NULL, 0, (const char**) config_dirs);
r = conf_files_list_strv(&files, ".conf", NULL, 0, (const char**) CONF_PATHS_STRV("binfmt.d"));
if (r < 0) {
log_error_errno(r, "Failed to enumerate binfmt.d files: %m");
goto finish;

6
src/sysctl/sysctl.c
View file

@ -29,8 +29,6 @@
static char **arg_prefixes = NULL;
static bool arg_cat_config = false;
static char **config_dirs = CONF_PATHS_STRV("sysctl.d");
static int apply_all(OrderedHashmap *sysctl_options) {
char *property, *value;
Iterator i;
@ -85,7 +83,7 @@ static int parse_file(OrderedHashmap *sysctl_options, const char *path, bool ign
assert(path);
r = search_and_fopen(path, "re", NULL, (const char**) config_dirs, &f);
r = search_and_fopen(path, "re", NULL, (const char**) CONF_PATHS_STRV("sysctl.d"), &f);
if (r < 0) {
if (ignore_enoent && r == -ENOENT)
return 0;
@ -282,7 +280,7 @@ int main(int argc, char *argv[]) {
_cleanup_strv_free_ char **files = NULL;
char **f;
r = conf_files_list_strv(&files, ".conf", NULL, 0, (const char**) config_dirs);
r = conf_files_list_strv(&files, ".conf", NULL, 0, (const char**) CONF_PATHS_STRV("sysctl.d"));
if (r < 0) {
log_error_errno(r, "Failed to enumerate sysctl.d files: %m");
goto finish;

8
src/sysusers/sysusers.c
View file

@ -66,8 +66,6 @@ static bool arg_cat_config = false;
static const char *arg_replace = NULL;
static bool arg_inline = false;
static char **config_dirs = CONF_PATHS_STRV("sysusers.d");
static OrderedHashmap *users = NULL, *groups = NULL;
static OrderedHashmap *todo_uids = NULL, *todo_gids = NULL;
static OrderedHashmap *members = NULL;
@ -1690,7 +1688,7 @@ static int read_config_file(const char *fn, bool ignore_enoent) {
if (streq(fn, "-"))
f = stdin;
else {
r = search_and_fopen(fn, "re", arg_root, (const char**) config_dirs, &rf);
r = search_and_fopen(fn, "re", arg_root, (const char**) CONF_PATHS_STRV("sysusers.d"), &rf);
if (r < 0) {
if (ignore_enoent && r == -ENOENT)
return 0;
@ -1751,7 +1749,7 @@ static int cat_config(void) {
_cleanup_free_ char *replace_file = NULL;
int r;
r = conf_files_list_with_replacement(arg_root, config_dirs, arg_replace, &files, NULL);
r = conf_files_list_with_replacement(arg_root, CONF_PATHS_STRV("sysusers.d"), arg_replace, &files, NULL);
if (r < 0)
return r;
@ -1876,7 +1874,7 @@ static int read_config_files(char **args) {
char **f;
int r;
r = conf_files_list_with_replacement(arg_root, config_dirs, arg_replace, &files, &p);
r = conf_files_list_with_replacement(arg_root, CONF_PATHS_STRV("sysusers.d"), arg_replace, &files, &p);
if (r < 0)
return r;