chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
treewide: simplify log_*_errno(r,...) immediately followed by "return r"
[elogind.git]
/
src
/
core
/
path.c
diff --git
a/src/core/path.c
b/src/core/path.c
index f54c77f6c3980804ececcf23a1286221adf37a7c..202cba5d31535b8e7bc2b7dcafb68fc6dbd1c35c 100644
(file)
--- a/
src/core/path.c
+++ b/
src/core/path.c
@@
-250,7
+250,7
@@
static void path_spec_mkdir(PathSpec *s, mode_t mode) {
r = mkdir_p_label(s->path, mode);
if (r < 0)
r = mkdir_p_label(s->path, mode);
if (r < 0)
- log_warning
("mkdir(%s) failed: %s", s->path, strerror(-r)
);
+ log_warning
_errno(r, "mkdir(%s) failed: %m", s->path
);
}
static void path_spec_dump(PathSpec *s, FILE *f, const char *prefix) {
}
static void path_spec_dump(PathSpec *s, FILE *f, const char *prefix) {
@@
-320,7
+320,7
@@
static int path_verify(Path *p) {
return 0;
if (!p->specs) {
return 0;
if (!p->specs) {
- log_
error_unit
(UNIT(p)->id,
+ log_
unit_error
(UNIT(p)->id,
"%s lacks path setting. Refusing.", UNIT(p)->id);
return -EINVAL;
}
"%s lacks path setting. Refusing.", UNIT(p)->id);
return -EINVAL;
}
@@
-562,8
+562,7
@@
static void path_enter_waiting(Path *p, bool initial, bool recheck) {
return;
fail:
return;
fail:
- log_warning("%s failed to enter waiting state: %s",
- UNIT(p)->id, strerror(-r));
+ log_warning_errno(r, "%s failed to enter waiting state: %m", UNIT(p)->id);
path_enter_dead(p, PATH_FAILURE_RESOURCES);
}
path_enter_dead(p, PATH_FAILURE_RESOURCES);
}
@@
-724,7
+723,7
@@
static void path_trigger_notify(Unit *u, Unit *other) {
if (p->state == PATH_RUNNING &&
UNIT_IS_INACTIVE_OR_FAILED(unit_active_state(other))) {
if (p->state == PATH_RUNNING &&
UNIT_IS_INACTIVE_OR_FAILED(unit_active_state(other))) {
- log_
debug_unit
(UNIT(p)->id,
+ log_
unit_debug
(UNIT(p)->id,
"%s got notified about unit deactivation.",
UNIT(p)->id);
"%s got notified about unit deactivation.",
UNIT(p)->id);