From a37452430f93700aeb122d693959ad79d8e43ada Mon Sep 17 00:00:00 2001 From: Rich Felker Date: Thu, 24 Mar 2011 23:16:52 -0400 Subject: simplify and optimize FILE lock handling --- src/internal/stdio_impl.h | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'src/internal') 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); -- cgit v1.2.1