chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
sd-journal: check if the pointers passed are the same
[elogind.git]
/
src
/
core
/
service.c
diff --git
a/src/core/service.c
b/src/core/service.c
index cf0bbe05fc649fa3d870acc29fd5f45322253d7a..3617c247117d7c88f23b266cf0604fd9cda204d7 100644
(file)
--- a/
src/core/service.c
+++ b/
src/core/service.c
@@
-1466,6
+1466,9
@@
static int service_search_main_pid(Service *s) {
r = unit_watch_pid(UNIT(s), pid);
if (r < 0)
/* FIXME: we need to do something here */
r = unit_watch_pid(UNIT(s), pid);
if (r < 0)
/* FIXME: we need to do something here */
+ log_warning_unit(UNIT(s)->id,
+ "Failed to watch PID %lu from service %s",
+ (unsigned long) pid, UNIT(s)->id);
return r;
return 0;
return r;
return 0;
@@
-1875,7
+1878,7
@@
static int main_pid_good(Service *s) {
return -EAGAIN;
}
return -EAGAIN;
}
-static int control_pid_good(Service *s) {
+
_pure_
static int control_pid_good(Service *s) {
assert(s);
return s->control_pid > 0;
assert(s);
return s->control_pid > 0;
@@
-2567,7
+2570,7
@@
static int service_reload(Unit *u) {
return 0;
}
return 0;
}
-static bool service_can_reload(Unit *u) {
+
_pure_
static bool service_can_reload(Unit *u) {
Service *s = SERVICE(u);
assert(s);
Service *s = SERVICE(u);
assert(s);
@@
-2779,7
+2782,7
@@
static int service_deserialize_item(Unit *u, const char *key, const char *value,
return 0;
}
return 0;
}
-static UnitActiveState service_active_state(Unit *u) {
+
_pure_
static UnitActiveState service_active_state(Unit *u) {
const UnitActiveState *table;
assert(u);
const UnitActiveState *table;
assert(u);
@@
-2815,7
+2818,7
@@
static bool service_check_gc(Unit *u) {
return false;
}
return false;
}
-static bool service_check_snapshot(Unit *u) {
+
_pure_
static bool service_check_snapshot(Unit *u) {
Service *s = SERVICE(u);
assert(s);
Service *s = SERVICE(u);
assert(s);