chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Prep v227: Removed src/shared/cgroup-show.[hc], it is not needed.
[elogind.git]
/
src
/
shared
/
clean-ipc.c
diff --git
a/src/shared/clean-ipc.c
b/src/shared/clean-ipc.c
index 48b10865da1b49fbd2ab3ab5019e30116f26be02..85d35a567be74ae3431d789837bfcdcc9d009671 100644
(file)
--- a/
src/shared/clean-ipc.c
+++ b/
src/shared/clean-ipc.c
@@
-26,7
+26,7
@@
#include <sys/stat.h>
#include <fcntl.h>
#include <dirent.h>
#include <sys/stat.h>
#include <fcntl.h>
#include <dirent.h>
-#include <mqueue.h>
+
//
#include <mqueue.h>
#include "util.h"
#include "formats-util.h"
#include "util.h"
#include "formats-util.h"
@@
-78,8
+78,9
@@
static int clean_sysvipc_shm(uid_t delete_uid) {
if (errno == EIDRM || errno == EINVAL)
continue;
if (errno == EIDRM || errno == EINVAL)
continue;
- log_warning_errno(errno, "Failed to remove SysV shared memory segment %i: %m", shmid);
- ret = -errno;
+ ret = log_warning_errno(errno,
+ "Failed to remove SysV shared memory segment %i: %m",
+ shmid);
}
}
}
}
@@
-130,8
+131,9
@@
static int clean_sysvipc_sem(uid_t delete_uid) {
if (errno == EIDRM || errno == EINVAL)
continue;
if (errno == EIDRM || errno == EINVAL)
continue;
- log_warning_errno(errno, "Failed to remove SysV semaphores object %i: %m", semid);
- ret = -errno;
+ ret = log_warning_errno(errno,
+ "Failed to remove SysV semaphores object %i: %m",
+ semid);
}
}
}
}
@@
-183,8
+185,9
@@
static int clean_sysvipc_msg(uid_t delete_uid) {
if (errno == EIDRM || errno == EINVAL)
continue;
if (errno == EIDRM || errno == EINVAL)
continue;
- log_warning_errno(errno, "Failed to remove SysV message queue %i: %m", msgid);
- ret = -errno;
+ ret = log_warning_errno(errno,
+ "Failed to remove SysV message queue %i: %m",
+ msgid);
}
}
}
}
@@
-277,6
+280,8
@@
static int clean_posix_shm(uid_t uid) {
return clean_posix_shm_internal(dir, uid);
}
return clean_posix_shm_internal(dir, uid);
}
+/// UNNEEDED by elogind
+#if 0
static int clean_posix_mq(uid_t uid) {
_cleanup_closedir_ DIR *dir = NULL;
struct dirent *de;
static int clean_posix_mq(uid_t uid) {
_cleanup_closedir_ DIR *dir = NULL;
struct dirent *de;
@@
-302,8
+307,9
@@
static int clean_posix_mq(uid_t uid) {
if (errno == ENOENT)
continue;
if (errno == ENOENT)
continue;
- log_warning_errno(errno, "Failed to stat() MQ segment %s: %m", de->d_name);
- ret = -errno;
+ ret = log_warning_errno(errno,
+ "Failed to stat() MQ segment %s: %m",
+ de->d_name);
continue;
}
continue;
}
@@
-317,8
+323,9
@@
static int clean_posix_mq(uid_t uid) {
if (errno == ENOENT)
continue;
if (errno == ENOENT)
continue;
- log_warning_errno(errno, "Failed to unlink POSIX message queue %s: %m", fn);
- ret = -errno;
+ ret = log_warning_errno(errno,
+ "Failed to unlink POSIX message queue %s: %m",
+ fn);
}
}
}
}
@@
-328,6
+335,7
@@
fail:
log_warning_errno(errno, "Failed to read /dev/mqueue: %m");
return -errno;
}
log_warning_errno(errno, "Failed to read /dev/mqueue: %m");
return -errno;
}
+#endif // 0
int clean_ipc(uid_t uid) {
int ret = 0, r;
int clean_ipc(uid_t uid) {
int ret = 0, r;
@@
-352,9
+360,12
@@
int clean_ipc(uid_t uid) {
if (r < 0)
ret = r;
if (r < 0)
ret = r;
+/// elogind does not use mq_open anywhere
+#if 0
r = clean_posix_mq(uid);
if (r < 0)
ret = r;
r = clean_posix_mq(uid);
if (r < 0)
ret = r;
+#endif // 0
return ret;
}
return ret;
}