diff options
| author | Rich Felker <dalias@aerifal.cx> | 2011-04-17 16:53:54 -0400 |
|---|---|---|
| committer | Rich Felker <dalias@aerifal.cx> | 2011-04-17 16:53:54 -0400 |
| commit | 9080cc153cc2b09881c3245becbd68534db18d7c (patch) | |
| tree | ddbc5aef325120e000b8e7d852f26322791deb55 /src/stdio | |
| parent | eb0e8fa0b1960cff4bd65ebefc798f70273b0bc9 (diff) | |
| download | musl-9080cc153cc2b09881c3245becbd68534db18d7c.tar.gz musl-9080cc153cc2b09881c3245becbd68534db18d7c.tar.xz musl-9080cc153cc2b09881c3245becbd68534db18d7c.zip | |
clean up handling of thread/nothread mode, locking
Diffstat (limited to 'src/stdio')
| -rw-r--r-- | src/stdio/flockfile.c | 5 | ||||
| -rw-r--r-- | src/stdio/ftrylockfile.c | 1 |
2 files changed, 1 insertions, 5 deletions
diff --git a/src/stdio/flockfile.c b/src/stdio/flockfile.c index 440a36a9..0d4c92c2 100644 --- a/src/stdio/flockfile.c +++ b/src/stdio/flockfile.c @@ -3,9 +3,6 @@ void flockfile(FILE *f) { - if (!libc.lockfile) { - pthread_self(); - libc.lockfile = __lockfile; - } + if (!libc.threaded) pthread_self(); __lockfile(f); } diff --git a/src/stdio/ftrylockfile.c b/src/stdio/ftrylockfile.c index 67f4b6a0..0b0e44aa 100644 --- a/src/stdio/ftrylockfile.c +++ b/src/stdio/ftrylockfile.c @@ -4,7 +4,6 @@ int ftrylockfile(FILE *f) { int tid = pthread_self()->tid; - if (!libc.lockfile) libc.lockfile = __lockfile; if (f->lock == tid) { if (f->lockcount == INT_MAX) return -1; |