chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
clients: unify how we invoke getopt_long()
[elogind.git]
/
src
/
core
/
execute.c
diff --git
a/src/core/execute.c
b/src/core/execute.c
index 3f7ca52139801ddc2606257100fa4d07b1618719..3ae28ee080af0531863c13da866d393c826f1474 100644
(file)
--- a/
src/core/execute.c
+++ b/
src/core/execute.c
@@
-511,7
+511,7
@@
fail:
return r;
}
return r;
}
-_printf_
attr_
(1, 2) static int write_confirm_message(const char *format, ...) {
+_printf_(1, 2) static int write_confirm_message(const char *format, ...) {
int fd;
va_list ap;
int fd;
va_list ap;
@@
-1089,7
+1089,7
@@
int exec_spawn(ExecCommand *command,
free(line);
if (context->private_tmp && !context->tmp_dir && !context->var_tmp_dir) {
free(line);
if (context->private_tmp && !context->tmp_dir && !context->var_tmp_dir) {
- r = setup_tmpdirs(&context->tmp_dir, &context->var_tmp_dir);
+ r = setup_tmpdirs(
unit_id,
&context->tmp_dir, &context->var_tmp_dir);
if (r < 0)
return r;
}
if (r < 0)
return r;
}
@@
-1706,7
+1706,7
@@
void exec_command_free_list(ExecCommand *c) {
ExecCommand *i;
while ((i = c)) {
ExecCommand *i;
while ((i = c)) {
- LIST_REMOVE(
ExecCommand,
command, c, i);
+ LIST_REMOVE(command, c, i);
exec_command_done(i);
free(i);
}
exec_command_done(i);
free(i);
}
@@
-2194,8
+2194,8
@@
void exec_command_append_list(ExecCommand **l, ExecCommand *e) {
if (*l) {
/* It's kind of important, that we keep the order here */
if (*l) {
/* It's kind of important, that we keep the order here */
- LIST_FIND_TAIL(
ExecCommand,
command, *l, end);
- LIST_INSERT_AFTER(
ExecCommand,
command, *l, end, e);
+ LIST_FIND_TAIL(command, *l, end);
+ LIST_INSERT_AFTER(command, *l, end, e);
} else
*l = e;
}
} else
*l = e;
}
@@
-2214,7
+2214,8
@@
int exec_command_set(ExecCommand *c, const char *path, ...) {
if (!l)
return -ENOMEM;
if (!l)
return -ENOMEM;
- if (!(p = strdup(path))) {
+ p = strdup(path);
+ if (!p) {
strv_free(l);
return -ENOMEM;
}
strv_free(l);
return -ENOMEM;
}