chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
man: fix minor ambuigity
[elogind.git]
/
src
/
path.c
diff --git
a/src/path.c
b/src/path.c
index 30d946d788a66cb58bbd4b971c10f456fa78c0f4..27c45447297882b3c44d522567fc1d7bfb915a90 100644
(file)
--- a/
src/path.c
+++ b/
src/path.c
@@
-30,6
+30,7
@@
#include "path.h"
#include "dbus-path.h"
#include "special.h"
#include "path.h"
#include "dbus-path.h"
#include "special.h"
+#include "bus-errors.h"
static const UnitActiveState state_translation_table[_PATH_STATE_MAX] = {
[PATH_DEAD] = UNIT_INACTIVE,
static const UnitActiveState state_translation_table[_PATH_STATE_MAX] = {
[PATH_DEAD] = UNIT_INACTIVE,
@@
-298,17
+299,22
@@
static void path_enter_dead(Path *p, bool success) {
static void path_enter_running(Path *p) {
int r;
static void path_enter_running(Path *p) {
int r;
+ DBusError error;
+
assert(p);
assert(p);
+ dbus_error_init(&error);
- if ((r = manager_add_job(p->meta.manager, JOB_START, p->unit, JOB_REPLACE, true, NULL)) < 0)
+ if ((r = manager_add_job(p->meta.manager, JOB_START, p->unit, JOB_REPLACE, true,
&error,
NULL)) < 0)
goto fail;
path_set_state(p, PATH_RUNNING);
return;
fail:
goto fail;
path_set_state(p, PATH_RUNNING);
return;
fail:
- log_warning("%s failed to queue unit startup job: %s", p->meta.id,
strerror(-
r));
+ log_warning("%s failed to queue unit startup job: %s", p->meta.id,
bus_error(&error,
r));
path_enter_dead(p, false);
path_enter_dead(p, false);
+
+ dbus_error_free(&error);
}
}