summaryrefslogtreecommitdiff
path: root/src/internal
diff options
context:
space:
mode:
authorRich Felker <dalias@aerifal.cx>2011-03-24 23:16:52 -0400
committerRich Felker <dalias@aerifal.cx>2011-03-24 23:16:52 -0400
commita37452430f93700aeb122d693959ad79d8e43ada (patch)
tree6ed8879bddb17c2b0db8c8bbd4778e11912f0767 /src/internal
parentd8dc2faf1033e134e3a8f39bdf15c065f4d234be (diff)
downloadmusl-a37452430f93700aeb122d693959ad79d8e43ada.tar.gz
musl-a37452430f93700aeb122d693959ad79d8e43ada.tar.bz2
musl-a37452430f93700aeb122d693959ad79d8e43ada.tar.xz
musl-a37452430f93700aeb122d693959ad79d8e43ada.zip
simplify and optimize FILE lock handling
Diffstat (limited to 'src/internal')
-rw-r--r--src/internal/stdio_impl.h5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/internal/stdio_impl.h b/src/internal/stdio_impl.h
index 4e6d3503..b977df68 100644
--- 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
@@ -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);