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 v228: Add remaining updates from upstream (3/3)
[elogind.git]
/
src
/
shared
/
clean-ipc.c
diff --git
a/src/shared/clean-ipc.c
b/src/shared/clean-ipc.c
index 85d35a567be74ae3431d789837bfcdcc9d009671..d2e0240a800a1cbea965064da08a553596aa4ab8 100644
(file)
--- a/
src/shared/clean-ipc.c
+++ b/
src/shared/clean-ipc.c
@@
-19,19
+19,23
@@
along with systemd; If not, see <http://www.gnu.org/licenses/>.
***/
along with systemd; If not, see <http://www.gnu.org/licenses/>.
***/
+#include <dirent.h>
+#include <fcntl.h>
+#include <mqueue.h>
#include <sys/ipc.h>
#include <sys/ipc.h>
-#include <sys/shm.h>
-#include <sys/sem.h>
#include <sys/msg.h>
#include <sys/msg.h>
+#include <sys/sem.h>
+#include <sys/shm.h>
#include <sys/stat.h>
#include <sys/stat.h>
-#include <fcntl.h>
-#include <dirent.h>
-//#include <mqueue.h>
-#include "util.h"
+#include "clean-ipc.h"
+#include "dirent-util.h"
+#include "fd-util.h"
+#include "fileio.h"
#include "formats-util.h"
#include "formats-util.h"
+#include "string-util.h"
#include "strv.h"
#include "strv.h"
-#include "
clean-ipc
.h"
+#include "
util
.h"
static int clean_sysvipc_shm(uid_t delete_uid) {
_cleanup_fclose_ FILE *f = NULL;
static int clean_sysvipc_shm(uid_t delete_uid) {
_cleanup_fclose_ FILE *f = NULL;
@@
-44,8
+48,7
@@
static int clean_sysvipc_shm(uid_t delete_uid) {
if (errno == ENOENT)
return 0;
if (errno == ENOENT)
return 0;
- log_warning_errno(errno, "Failed to open /proc/sysvipc/shm: %m");
- return -errno;
+ return log_warning_errno(errno, "Failed to open /proc/sysvipc/shm: %m");
}
FOREACH_LINE(line, f, goto fail) {
}
FOREACH_LINE(line, f, goto fail) {
@@
-87,8
+90,7
@@
static int clean_sysvipc_shm(uid_t delete_uid) {
return ret;
fail:
return ret;
fail:
- log_warning_errno(errno, "Failed to read /proc/sysvipc/shm: %m");
- return -errno;
+ return log_warning_errno(errno, "Failed to read /proc/sysvipc/shm: %m");
}
static int clean_sysvipc_sem(uid_t delete_uid) {
}
static int clean_sysvipc_sem(uid_t delete_uid) {
@@
-102,8
+104,7
@@
static int clean_sysvipc_sem(uid_t delete_uid) {
if (errno == ENOENT)
return 0;
if (errno == ENOENT)
return 0;
- log_warning_errno(errno, "Failed to open /proc/sysvipc/sem: %m");
- return -errno;
+ return log_warning_errno(errno, "Failed to open /proc/sysvipc/sem: %m");
}
FOREACH_LINE(line, f, goto fail) {
}
FOREACH_LINE(line, f, goto fail) {
@@
-140,8
+141,7
@@
static int clean_sysvipc_sem(uid_t delete_uid) {
return ret;
fail:
return ret;
fail:
- log_warning_errno(errno, "Failed to read /proc/sysvipc/sem: %m");
- return -errno;
+ return log_warning_errno(errno, "Failed to read /proc/sysvipc/sem: %m");
}
static int clean_sysvipc_msg(uid_t delete_uid) {
}
static int clean_sysvipc_msg(uid_t delete_uid) {
@@
-155,8
+155,7
@@
static int clean_sysvipc_msg(uid_t delete_uid) {
if (errno == ENOENT)
return 0;
if (errno == ENOENT)
return 0;
- log_warning_errno(errno, "Failed to open /proc/sysvipc/msg: %m");
- return -errno;
+ return log_warning_errno(errno, "Failed to open /proc/sysvipc/msg: %m");
}
FOREACH_LINE(line, f, goto fail) {
}
FOREACH_LINE(line, f, goto fail) {
@@
-194,8
+193,7
@@
static int clean_sysvipc_msg(uid_t delete_uid) {
return ret;
fail:
return ret;
fail:
- log_warning_errno(errno, "Failed to read /proc/sysvipc/msg: %m");
- return -errno;
+ return log_warning_errno(errno, "Failed to read /proc/sysvipc/msg: %m");
}
static int clean_posix_shm_internal(DIR *dir, uid_t uid) {
}
static int clean_posix_shm_internal(DIR *dir, uid_t uid) {
@@
-273,8
+271,7
@@
static int clean_posix_shm(uid_t uid) {
if (errno == ENOENT)
return 0;
if (errno == ENOENT)
return 0;
- log_warning_errno(errno, "Failed to open /dev/shm: %m");
- return -errno;
+ return log_warning_errno(errno, "Failed to open /dev/shm: %m");
}
return clean_posix_shm_internal(dir, uid);
}
return clean_posix_shm_internal(dir, uid);
@@
-292,8
+289,7
@@
static int clean_posix_mq(uid_t uid) {
if (errno == ENOENT)
return 0;
if (errno == ENOENT)
return 0;
- log_warning_errno(errno, "Failed to open /dev/mqueue: %m");
- return -errno;
+ return log_warning_errno(errno, "Failed to open /dev/mqueue: %m");
}
FOREACH_DIRENT(de, dir, goto fail) {
}
FOREACH_DIRENT(de, dir, goto fail) {
@@
-332,8
+328,7
@@
static int clean_posix_mq(uid_t uid) {
return ret;
fail:
return ret;
fail:
- log_warning_errno(errno, "Failed to read /dev/mqueue: %m");
- return -errno;
+ return log_warning_errno(errno, "Failed to read /dev/mqueue: %m");
}
#endif // 0
}
#endif // 0