summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2014-11-07 02:05:50 +0100
committerLennart Poettering <lennart@poettering.net>2014-11-07 02:05:50 +0100
commit498e87d6b7ef025fef2e089931f355b5cd3c7dad (patch)
treebf59fc45d884501838cd6fa97268107ffa8c48ac
parent4e143738bf170be9f957c47605deea8c54b75fdf (diff)
manager: cast mkdir() result to (void) to make sure coverity is quiet
Also simplify the code a bit by moving mkdir to the common path.
-rw-r--r--src/core/manager.c14
1 files changed, 6 insertions, 8 deletions
diff --git a/src/core/manager.c b/src/core/manager.c
index 129f6dd3a8..e596494646 100644
--- a/src/core/manager.c
+++ b/src/core/manager.c
@@ -662,11 +662,9 @@ static int manager_setup_notify(Manager *m) {
return -errno;
}
- if (m->running_as == SYSTEMD_SYSTEM) {
+ if (m->running_as == SYSTEMD_SYSTEM)
m->notify_socket = strdup("/run/systemd/notify");
- if (!m->notify_socket)
- return log_oom();
- } else {
+ else {
const char *e;
e = getenv("XDG_RUNTIME_DIR");
@@ -676,11 +674,11 @@ static int manager_setup_notify(Manager *m) {
}
m->notify_socket = strappend(e, "/systemd/notify");
- if (!m->notify_socket)
- return log_oom();
-
- mkdir_parents_label(m->notify_socket, 0755);
}
+ if (!m->notify_socket)
+ return log_oom();
+
+ (void) mkdir_parents_label(m->notify_socket, 0755);
strncpy(sa.un.sun_path, m->notify_socket, sizeof(sa.un.sun_path)-1);
r = bind(fd, &sa.sa, offsetof(struct sockaddr_un, sun_path) + strlen(sa.un.sun_path));