shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-03-09 12:58:26 +03:00
Code

core: make exec_command_free_list return NULL

Browse Source
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2014-12-18 12:29:24 -05:00
parent f08fa3be8d
commit f1acf85a36
4 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/core/dbus-service.c
View File

@ -187,10 +187,8 @@ static int bus_service_set_transient_property(
ExecCommand *c;
size_t size = 0;
if (n == 0) {
exec_command_free_list(s->exec_command[SERVICE_EXEC_START]);
s->exec_command[SERVICE_EXEC_START] = NULL;
}
if (n == 0)
s->exec_command[SERVICE_EXEC_START] = exec_command_free_list(s->exec_command[SERVICE_EXEC_START]);
f = open_memstream(&buf, &size);
if (!f)

10
src/core/execute.c
View File

@ -2007,7 +2007,7 @@ void exec_command_done_array(ExecCommand *c, unsigned n) {
exec_command_done(c+i);
}
void exec_command_free_list(ExecCommand *c) {
ExecCommand* exec_command_free_list(ExecCommand *c) {
ExecCommand *i;
while ((i = c)) {
@ -2015,15 +2015,15 @@ void exec_command_free_list(ExecCommand *c) {
exec_command_done(i);
free(i);
}
return NULL;
}
void exec_command_free_array(ExecCommand **c, unsigned n) {
unsigned i;
for (i = 0; i < n; i++) {
exec_command_free_list(c[i]);
c[i] = NULL;
}
for (i = 0; i < n; i++)
c[i] = exec_command_free_list(c[i]);
}
int exec_context_load_environment(const ExecContext *c, const char *unit_id, char ***l) {

2
src/core/execute.h
View File

@ -228,7 +228,7 @@ int exec_spawn(ExecCommand *command,
void exec_command_done(ExecCommand *c);
void exec_command_done_array(ExecCommand *c, unsigned n);
void exec_command_free_list(ExecCommand *c);
ExecCommand* exec_command_free_list(ExecCommand *c);
void exec_command_free_array(ExecCommand **c, unsigned n);
char *exec_command_line(char **argv);

3
src/core/load-fragment.c
View File

@ -538,8 +538,7 @@ int config_parse_exec(const char *unit,
if (isempty(rvalue)) {
/* An empty assignment resets the list */
exec_command_free_list(*e);
*e = NULL;
*e = exec_command_free_list(*e);
return 0;
}