shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2024-11-08 11:27:32 +03:00
Code

strv: add strv_free_free() to strv.c and make use of it

Browse Source 
Let's teach it a new trick, and make it return NULL.
This commit is contained in:
Lennart Poettering 2015-09-23 01:01:26 +02:00
parent 3ee897d6c2
commit fe382237ca
3 changed files with 28 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/basic/strv.c
View File

@ -720,3 +720,16 @@ bool strv_fnmatch(char* const* patterns, const char *s, int flags) {
return false; return false;
} }
char ***strv_free_free(char ***l) {
char ***i;
if (!l)
return NULL;
for (i = l; *i; i++)
strv_free(*i);
free(l);
return NULL;
}

2
src/basic/strv.h
View File

@ -154,3 +154,5 @@ static inline bool strv_fnmatch_or_empty(char* const* patterns, const char *s, i
return strv_isempty(patterns) || return strv_isempty(patterns) ||
strv_fnmatch(patterns, s, flags); strv_fnmatch(patterns, s, flags);
} }
char ***strv_free_free(char ***l);

41
src/core/main.c
View File

@ -478,23 +478,6 @@ static int config_parse_show_status(
return 0; return 0;
} }
static void strv_free_free(char ***l) {
char ***i;
if (!l)
return;
for (i = l; *i; i++)
strv_free(*i);
free(l);
}
static void free_join_controllers(void) {
strv_free_free(arg_join_controllers);
arg_join_controllers = NULL;
}
static int config_parse_join_controllers(const char *unit, static int config_parse_join_controllers(const char *unit,
const char *filename, const char *filename,
unsigned line, unsigned line,
@ -513,7 +496,7 @@ static int config_parse_join_controllers(const char *unit,
assert(lvalue); assert(lvalue);
assert(rvalue); assert(rvalue);
free_join_controllers(); arg_join_controllers = strv_free_free(arg_join_controllers);
for (;;) { for (;;) {
_cleanup_free_ char *word = NULL; _cleanup_free_ char *word = NULL;
@ -1116,15 +1099,19 @@ static int initialize_join_controllers(void) {
return -ENOMEM; return -ENOMEM;
arg_join_controllers[0] = strv_new("cpu", "cpuacct", NULL); arg_join_controllers[0] = strv_new("cpu", "cpuacct", NULL);
if (!arg_join_controllers[0])
goto oom;
arg_join_controllers[1] = strv_new("net_cls", "net_prio", NULL); arg_join_controllers[1] = strv_new("net_cls", "net_prio", NULL);
if (!arg_join_controllers[1])
goto oom;
arg_join_controllers[2] = NULL; arg_join_controllers[2] = NULL;
if (!arg_join_controllers[0] || !arg_join_controllers[1]) {
free_join_controllers();
return -ENOMEM;
}
return 0; return 0;
oom:
arg_join_controllers = strv_free_free(arg_join_controllers);
return -ENOMEM;
} }
static int enforce_syscall_archs(Set *archs) { static int enforce_syscall_archs(Set *archs) {
@ -1813,17 +1800,15 @@ finish:
arg_shutdown_watchdog = m->shutdown_watchdog; arg_shutdown_watchdog = m->shutdown_watchdog;
shutdown_exit_code = m->return_value; shutdown_exit_code = m->return_value;
} }
m = manager_free(m); m = manager_free(m);
for (j = 0; j < ELEMENTSOF(arg_default_rlimit); j++) for (j = 0; j < ELEMENTSOF(arg_default_rlimit); j++)
arg_default_rlimit[j] = mfree(arg_default_rlimit[j]); arg_default_rlimit[j] = mfree(arg_default_rlimit[j]);
arg_default_unit = mfree(arg_default_unit); arg_default_unit = mfree(arg_default_unit);
arg_join_controllers = strv_free_free(arg_join_controllers);
free_join_controllers();
arg_default_environment = strv_free(arg_default_environment); arg_default_environment = strv_free(arg_default_environment);
arg_syscall_archs = set_free(arg_syscall_archs); arg_syscall_archs = set_free(arg_syscall_archs);
mac_selinux_finish(); mac_selinux_finish();