chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
clang: fix numerous little issues found with clang-analyzer
[elogind.git]
/
src
/
path.c
diff --git
a/src/path.c
b/src/path.c
index a9fa3771ab0454786a9a1b3326de1f4ba3d8b548..2f1e0aea632631bc59bf11701cd64f3fcfde60e7 100644
(file)
--- a/
src/path.c
+++ b/
src/path.c
@@
-110,7
+110,7
@@
static int path_add_default_dependencies(Path *p) {
if ((r = unit_add_two_dependencies_by_name(UNIT(p), UNIT_AFTER, UNIT_REQUIRES, SPECIAL_SYSINIT_TARGET, NULL, true)) < 0)
return r;
if ((r = unit_add_two_dependencies_by_name(UNIT(p), UNIT_AFTER, UNIT_REQUIRES, SPECIAL_SYSINIT_TARGET, NULL, true)) < 0)
return r;
- return unit_add_two_dependencies_by_name(UNIT(p), UNIT_BEFORE, UNIT_CONFLICT
S
, SPECIAL_SHUTDOWN_TARGET, NULL, true);
+ return unit_add_two_dependencies_by_name(UNIT(p), UNIT_BEFORE, UNIT_CONFLICT
ED_BY
, SPECIAL_SHUTDOWN_TARGET, NULL, true);
}
static int path_load(Unit *u) {
}
static int path_load(Unit *u) {
@@
-145,12
+145,10
@@
static int path_load(Unit *u) {
static void path_dump(Unit *u, FILE *f, const char *prefix) {
Path *p = PATH(u);
static void path_dump(Unit *u, FILE *f, const char *prefix) {
Path *p = PATH(u);
- const char *prefix2;
- char *p2;
PathSpec *s;
PathSpec *s;
-
p2 = strappend(prefix, "\t"
);
-
prefix2 = p2 ? p2 : prefix
;
+
assert(p
);
+
assert(f)
;
fprintf(f,
"%sPath State: %s\n"
fprintf(f,
"%sPath State: %s\n"
@@
-164,8
+162,6
@@
static void path_dump(Unit *u, FILE *f, const char *prefix) {
prefix,
path_type_to_string(s->type),
s->path);
prefix,
path_type_to_string(s->type),
s->path);
-
- free(p2);
}
static void path_unwatch_one(Path *p, PathSpec *s) {
}
static void path_unwatch_one(Path *p, PathSpec *s) {
@@
-560,6
+556,17
@@
fail:
log_error("Failed find path unit: %s", strerror(-r));
}
log_error("Failed find path unit: %s", strerror(-r));
}
+static void path_reset_maintenance(Unit *u) {
+ Path *p = PATH(u);
+
+ assert(p);
+
+ if (p->state == PATH_MAINTENANCE)
+ path_set_state(p, PATH_DEAD);
+
+ p->failure = false;
+}
+
static const char* const path_state_table[_PATH_STATE_MAX] = {
[PATH_DEAD] = "dead",
[PATH_WAITING] = "waiting",
static const char* const path_state_table[_PATH_STATE_MAX] = {
[PATH_DEAD] = "dead",
[PATH_WAITING] = "waiting",
@@
-598,5
+605,7
@@
const UnitVTable path_vtable = {
.fd_event = path_fd_event,
.fd_event = path_fd_event,
+ .reset_maintenance = path_reset_maintenance,
+
.bus_message_handler = bus_path_message_handler
};
.bus_message_handler = bus_path_message_handler
};