chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
time-util: introduce deserialize_timestamp_value()
[elogind.git]
/
src
/
basic
/
memfd-util.c
diff --git
a/src/basic/memfd-util.c
b/src/basic/memfd-util.c
index fef163457e4fd24d45a28f8ea3153f6a55540eb9..66b5e5c7b932b845218cacf778aa941bde624eb3 100644
(file)
--- a/
src/basic/memfd-util.c
+++ b/
src/basic/memfd-util.c
@@
-1,5
+1,3
@@
-/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
-
/***
This file is part of systemd.
/***
This file is part of systemd.
@@
-19,19
+17,24
@@
along with systemd; If not, see <http://www.gnu.org/licenses/>.
***/
along with systemd; If not, see <http://www.gnu.org/licenses/>.
***/
-#include <
stdi
o.h>
+#include <
errn
o.h>
#include <fcntl.h>
#include <fcntl.h>
-#include <sys/mman.h>
-#include <sys/prctl.h>
-
+#include <sys/stat.h>
+#include <unistd.h>
#ifdef HAVE_LINUX_MEMFD_H
# include <linux/memfd.h>
#endif
#ifdef HAVE_LINUX_MEMFD_H
# include <linux/memfd.h>
#endif
+#include <stdio.h>
+#include <sys/mman.h>
+#include <sys/prctl.h>
-#include "util.h"
+#include "alloc-util.h"
+#include "fd-util.h"
+#include "macro.h"
#include "memfd-util.h"
#include "memfd-util.h"
-#include "utf8.h"
#include "missing.h"
#include "missing.h"
+#include "string-util.h"
+#include "utf8.h"
int memfd_new(const char *name) {
_cleanup_free_ char *g = NULL;
int memfd_new(const char *name) {
_cleanup_free_ char *g = NULL;
@@
-70,8
+73,7
@@
int memfd_new(const char *name) {
return fd;
}
return fd;
}
-/// UNNEEDED by elogind
-#if 0
+#if 0 /// UNNEEDED by elogind
int memfd_map(int fd, uint64_t offset, size_t size, void **p) {
void *q;
int sealed;
int memfd_map(int fd, uint64_t offset, size_t size, void **p) {
void *q;
int sealed;
@@
-109,6
+111,7
@@
int memfd_set_sealed(int fd) {
return 0;
}
return 0;
}
+#if 0 /// UNNEEDED by elogind
int memfd_get_sealed(int fd) {
int r;
int memfd_get_sealed(int fd) {
int r;
@@
-121,8
+124,6
@@
int memfd_get_sealed(int fd) {
return r == (F_SEAL_SHRINK | F_SEAL_GROW | F_SEAL_WRITE | F_SEAL_SEAL);
}
return r == (F_SEAL_SHRINK | F_SEAL_GROW | F_SEAL_WRITE | F_SEAL_SEAL);
}
-/// UNNEEDED by elogind
-#if 0
int memfd_get_size(int fd, uint64_t *sz) {
struct stat stat;
int r;
int memfd_get_size(int fd, uint64_t *sz) {
struct stat stat;
int r;
@@
-151,8
+152,7
@@
int memfd_set_size(int fd, uint64_t sz) {
return 0;
}
return 0;
}
-/// UNNEEDED by elogind
-#if 0
+#if 0 /// UNNEEDED by elogind
int memfd_new_and_map(const char *name, size_t sz, void **p) {
_cleanup_close_ int fd = -1;
int r;
int memfd_new_and_map(const char *name, size_t sz, void **p) {
_cleanup_close_ int fd = -1;
int r;