chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
log: pass SCM_CREDENTIALS when logging to syslog
[elogind.git]
/
src
/
path.c
diff --git
a/src/path.c
b/src/path.c
index f4c20940d07842f7dce19aeaf02b621feeaa5e10..42c64f3eb1aaf5bd06d2d195f0da50a908f68c5b 100644
(file)
--- a/
src/path.c
+++ b/
src/path.c
@@
-1,4
+1,4
@@
-/*-*- Mode: C; c-basic-offset: 8 -*-*/
+/*-*- Mode: C; c-basic-offset: 8
; indent-tabs-mode: nil
-*-*/
/***
This file is part of systemd.
/***
This file is part of systemd.
@@
-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) {
@@
-611,5
+607,6
@@
const UnitVTable path_vtable = {
.reset_maintenance = path_reset_maintenance,
.reset_maintenance = path_reset_maintenance,
+ .bus_interface = "org.freedesktop.systemd1.Path",
.bus_message_handler = bus_path_message_handler
};
.bus_message_handler = bus_path_message_handler
};