shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-01-10 05:18:17 +03:00
Code

shared/install: try even harder to make sure variable is initalized

Browse Source 
Apparently the fix in a05294ff05 was
not sufficient. Let's declare the two arrays as static variables.
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2019-03-26 12:46:02 +01:00
parent 9ca5828475
commit 10fd1d46fc
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/shared/install.c
View File

@ -2822,17 +2822,17 @@ static int split_pattern_into_name_and_instances(const char *pattern, char **out
}
static int presets_find_config(UnitFileScope scope, const char *root_dir, char ***files) {
static const char* const system_dirs[] = {CONF_PATHS("systemd/system-preset"), NULL};
static const char* const user_dirs[] = {CONF_PATHS_USR("systemd/user-preset"), NULL};
const char* const* dirs;
assert(scope >= 0);
assert(scope < _UNIT_FILE_SCOPE_MAX);
if (scope == UNIT_FILE_SYSTEM)
dirs = (const char* const*) CONF_PATHS_STRV("systemd/system-preset");
dirs = system_dirs;
else if (IN_SET(scope, UNIT_FILE_GLOBAL, UNIT_FILE_USER))
dirs = (const char* const*) CONF_PATHS_USR_STRV("systemd/user-preset");
dirs = user_dirs;
else
assert_not_reached("Invalid unit file scope");