d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Backout the previous revision due to objections.

Browse Source
This commit is contained in:
John Birrell 2004-03-09 04:51:58 +00:00
parent 618c18c7c3
commit 44fce14365
2 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/libc/stdio/_flock_stub.c
View File

@ -73,9 +73,7 @@ _flockfile(FILE *fp)
{
pthread_t curthread = _pthread_self();
if (fp->_lock == NULL) {
}
else if (fp->_lock->fl_owner == curthread)
if (fp->_lock->fl_owner == curthread)
fp->_lock->fl_count++;
else {
/*
@ -103,9 +101,7 @@ _ftrylockfile(FILE *fp)
pthread_t curthread = _pthread_self();
int ret = 0;
if (fp->_lock == NULL) {
}
else if (fp->_lock->fl_owner == curthread)
if (fp->_lock->fl_owner == curthread)
fp->_lock->fl_count++;
/*
* Make sure this mutex is treated as a private
@ -125,12 +121,10 @@ _funlockfile(FILE *fp)
{
pthread_t curthread = _pthread_self();
if (fp->_lock == NULL) {
}
/*
* Check if this file is owned by the current thread:
*/
else if (fp->_lock->fl_owner == curthread) {
if (fp->_lock->fl_owner == curthread) {
/*
* Check if this thread has locked the FILE
* more than once:

2
lib/libc/stdio/local.h
View File

@ -143,6 +143,6 @@ struct __sFILEX {
* orientation. If o < 0, the stream has byte-orientation.
*/
#define ORIENT(fp, o) do { \
if ((fp)->_extra != NULL && (fp)->_extra->orientation == 0) \
if ((fp)->_extra->orientation == 0) \
(fp)->_extra->orientation = (o); \
} while (0)