picnoir
/
Systemd
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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.
This commit is contained in:
Lennart Poettering 2014-11-07 02:05:50 +01:00
parent 4e143738bf
commit 498e87d6b7
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/core/manager.c
View File

@ -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));