simplify and optimize FILE lock handling

[oweals/musl.git] / src / internal / stdio_impl.h

diff --git a/src/internal/stdio_impl.h b/src/internal/stdio_impl.h
index 13e5cfd9019c946057450a5481f898121c579a67..b977df6829013714e1bb52e753ade4f9abadc12f 100644 (file)
--- a/src/internal/stdio_impl.h
+++ b/src/internal/stdio_impl.h
@@ -23,8 +23,8 @@
 
 #define UNGET 4
 
-#define FLOCK(f) ((libc.lockfile && (f)->owner>=0) ? (libc.lockfile((f)),0) : 0)
-#define FUNLOCK(f) ((f)->lockcount && (--(f)->lockcount || ((f)->owner=(f)->lock=0)))
+#define FLOCK(f) ((libc.lockfile && (f)->lock>=0) ? (libc.lockfile((f)),0) : 0)
+#define FUNLOCK(f) ((f)->lockcount && (--(f)->lockcount || ((f)->lock=0)))
 
 #define F_PERM 1
 #define F_NORD 4
@@ -50,7 +50,7 @@ struct __FILE_s {
        signed char lbf;
        int lock;
        int lockcount;
-       void *dummy5;
+       void *cookie;
        off_t off;
        int (*flush)(FILE *);
        void **wide_data; /* must be NULL */
@@ -59,7 +59,6 @@ struct __FILE_s {
        off_t (*seek)(FILE *, off_t, int);
        int mode;
        int (*close)(FILE *);
-       int owner;
 };
 
 size_t __stdio_read(FILE *, unsigned char *, size_t);