chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
core: fix deserialization of StartTransientUnit() parameters
[elogind.git]
/
src
/
core
/
execute.c
diff --git
a/src/core/execute.c
b/src/core/execute.c
index b48b1ae513baa3c8a7be940b7c6c99baff4be0b4..1e571da69c5e74d5a726f204933924cf308e9747 100644
(file)
--- a/
src/core/execute.c
+++ b/
src/core/execute.c
@@
-155,7
+155,7
@@
_pure_ static const char *tty_path(const ExecContext *context) {
return "/dev/console";
}
return "/dev/console";
}
-void exec_context_tty_reset(const ExecContext *context) {
+
static
void exec_context_tty_reset(const ExecContext *context) {
assert(context);
if (context->tty_vhangup)
assert(context);
if (context->tty_vhangup)
@@
-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;
}
@@
-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;
}