chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
shared: make sure foo.bar and foobar result in different domain name hashes
[elogind.git]
/
src
/
basic
/
memfd-util.c
diff --git
a/src/basic/memfd-util.c
b/src/basic/memfd-util.c
index b6dc19082864c647189c5181fa52df99bbedbe81..1f92b681fa27afc1c35c3aa8783c2b302826c14b 100644
(file)
--- a/
src/basic/memfd-util.c
+++ b/
src/basic/memfd-util.c
@@
-19,19
+19,21
@@
along with systemd; If not, see <http://www.gnu.org/licenses/>.
***/
along with systemd; If not, see <http://www.gnu.org/licenses/>.
***/
-#include <stdio.h>
#include <fcntl.h>
#include <fcntl.h>
-#include <sys/mman.h>
-#include <sys/prctl.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 "memfd-util.h"
#include "memfd-util.h"
-#include "utf8.h"
#include "missing.h"
#include "missing.h"
+#include "string-util.h"
+#include "utf8.h"
+#include "util.h"
int memfd_new(const char *name) {
_cleanup_free_ char *g = NULL;
int memfd_new(const char *name) {
_cleanup_free_ char *g = NULL;
@@
-70,6
+72,7
@@
int memfd_new(const char *name) {
return fd;
}
return fd;
}
+#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;
@@
-93,6
+96,7
@@
int memfd_map(int fd, uint64_t offset, size_t size, void **p) {
*p = q;
return 0;
}
*p = q;
return 0;
}
+#endif // 0
int memfd_set_sealed(int fd) {
int r;
int memfd_set_sealed(int fd) {
int r;
@@
-106,6
+110,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;
@@
-132,6
+137,7
@@
int memfd_get_size(int fd, uint64_t *sz) {
*sz = stat.st_size;
return 0;
}
*sz = stat.st_size;
return 0;
}
+#endif // 0
int memfd_set_size(int fd, uint64_t sz) {
int r;
int memfd_set_size(int fd, uint64_t sz) {
int r;
@@
-145,8
+151,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;