reverse definition dependency between PAGESIZE and PAGE_SIZE

[oweals/musl.git] / src / stdio / fmemopen.c

diff --git a/src/stdio/fmemopen.c b/src/stdio/fmemopen.c
index 1b054a970445e71ba5e86d363833c05fceb6faf3..2ce43d327f812145be057a4d61f684dfb615f844 100644 (file)
--- a/src/stdio/fmemopen.c
+++ b/src/stdio/fmemopen.c
@@ -1,4 +1,7 @@
 #include "stdio_impl.h"
+#include <errno.h>
+#include <string.h>
+#include <inttypes.h>
 
 struct cookie {
        size_t pos, len, size;
@@ -67,7 +70,7 @@ static int mclose(FILE *m)
        return 0;
 }
 
-FILE *fmemopen(void *buf, size_t size, const char *mode)
+FILE *fmemopen(void *restrict buf, size_t size, const char *restrict mode)
 {
        FILE *f;
        struct cookie *c;
@@ -78,7 +81,7 @@ FILE *fmemopen(void *buf, size_t size, const char *mode)
                return 0;
        }
 
-       if (!buf && size > SIZE_MAX-sizeof(FILE)-BUFSIZ-UNGET) {
+       if (!buf && size > PTRDIFF_MAX) {
                errno = ENOMEM;
                return 0;
        }
@@ -105,12 +108,7 @@ FILE *fmemopen(void *buf, size_t size, const char *mode)
        f->seek = mseek;
        f->close = mclose;
 
-       if (!libc.threaded) {
-               f->lock = -1;
-               f->next = libc.ofl_head;
-               if (libc.ofl_head) libc.ofl_head->prev = f;
-               libc.ofl_head = f;
-       }
+       if (!libc.threaded) f->lock = -1;
 
-       return f;
+       return __ofl_add(f);
 }