chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
bus: introduce new SD_BUS_VTABLE_HIDDEN flag for vtable members
[elogind.git]
/
src
/
core
/
service.c
diff --git
a/src/core/service.c
b/src/core/service.c
index 10bf7cb5a6eb061d5a8075cfc04b4bc7664f3322..702443d215c4d7650cebeeeab684e14fb7090a8b 100644
(file)
--- a/
src/core/service.c
+++ b/
src/core/service.c
@@
-790,7
+790,7
@@
static int service_load_sysv_path(Service *s, const char *path) {
goto finish;
}
goto finish;
}
- r = sysv_translate_facility(n,
path_get_file_
name(path), &m);
+ r = sysv_translate_facility(n,
base
name(path), &m);
free(n);
if (r < 0)
free(n);
if (r < 0)
@@
-842,7
+842,7
@@
static int service_load_sysv_path(Service *s, const char *path) {
goto finish;
}
goto finish;
}
- r = sysv_translate_facility(n,
path_get_file_
name(path), &m);
+ r = sysv_translate_facility(n,
base
name(path), &m);
if (r < 0) {
log_error_unit(u->id,
"[%s:%u] Failed to translate LSB dependency %s, ignoring: %s",
if (r < 0) {
log_error_unit(u->id,
"[%s:%u] Failed to translate LSB dependency %s, ignoring: %s",
@@
-2827,7
+2827,7
@@
_pure_ static bool service_check_snapshot(Unit *u) {
assert(s);
assert(s);
- return
!s->got_socket_fd
;
+ return
(s->socket_fd < 0)
;
}
static int service_retry_pid_file(Service *s) {
}
static int service_retry_pid_file(Service *s) {
@@
-3678,7
+3678,7
@@
static void service_bus_name_owner_change(
/* Try to acquire PID from bus service */
/* Try to acquire PID from bus service */
- r = sd_bus_get_owner(u->manager->api_bus, name, SD_BUS_CREDS_PID,
NULL,
&creds);
+ r = sd_bus_get_owner(u->manager->api_bus, name, SD_BUS_CREDS_PID, &creds);
if (r >= 0)
r = sd_bus_creds_get_pid(creds, &pid);
if (r >= 0) {
if (r >= 0)
r = sd_bus_creds_get_pid(creds, &pid);
if (r >= 0) {
@@
-3709,7
+3709,6
@@
int service_set_socket_fd(Service *s, int fd, Socket *sock) {
return -EAGAIN;
s->socket_fd = fd;
return -EAGAIN;
s->socket_fd = fd;
- s->got_socket_fd = true;
unit_ref_set(&s->accept_socket, UNIT(sock));
unit_ref_set(&s->accept_socket, UNIT(sock));