X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fbasic%2Fmemfd-util.c;h=e857c040d8657db9fa8ed831e16e5f53b512a7f7;hp=b6dc19082864c647189c5181fa52df99bbedbe81;hb=9742b1e43855b1599bd52ff95af995d9a9d35eac;hpb=3b22396a4b2767a98172f6915929c47738cb0a1e

diff --git a/src/basic/memfd-util.c b/src/basic/memfd-util.c
index b6dc19082..e857c040d 100644
--- 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.
 
@@ -19,19 +17,24 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include <stdio.h>
+#include <errno.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>
+#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 "utf8.h"
 #include "missing.h"
+#include "string-util.h"
+#include "utf8.h"
 
 int memfd_new(const char *name) {
         _cleanup_free_ char *g = NULL;
@@ -70,6 +73,7 @@ int memfd_new(const char *name) {
         return fd;
 }
 
+#if 0 /// UNNEEDED by elogind
 int memfd_map(int fd, uint64_t offset, size_t size, void **p) {
         void *q;
         int sealed;
@@ -93,6 +97,7 @@ int memfd_map(int fd, uint64_t offset, size_t size, void **p) {
         *p = q;
         return 0;
 }
+#endif // 0
 
 int memfd_set_sealed(int fd) {
         int r;
@@ -106,6 +111,7 @@ int memfd_set_sealed(int fd) {
         return 0;
 }
 
+#if 0 /// UNNEEDED by elogind
 int memfd_get_sealed(int fd) {
         int r;
 
@@ -132,6 +138,7 @@ int memfd_get_size(int fd, uint64_t *sz) {
         *sz = stat.st_size;
         return 0;
 }
+#endif // 0
 
 int memfd_set_size(int fd, uint64_t sz) {
         int r;
@@ -145,8 +152,7 @@ int memfd_set_size(int fd, uint64_t sz) {
         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;