From a91d3cd37bec7699597a45016f4cec985b9f3482 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Fri, 1 Sep 2000 08:56:06 +0000 Subject: Update. * libio/Makefile (headers): Add stdio_ext.h. (routines): Add __fbufsize, __freading, __fwriting, __freadable, __fwritable, __flbf, __fpurge, __fpending, and __fsetlocking. * libio/Versions [libc] (GLIBC_2.2): Add __fbufsize, __freading, __fwriting, __freadable, __fwritable, __flbf, __fpurge, __fpending, __fsetlocking, and _flushlbf. * libio/__fbufsize.c: New file. * libio/__flbf.c: New file. * libio/__fpending.c: New file. * libio/__fpurge.c: New file. * libio/__freadable.c: New file. * libio/__freading.c: New file. * libio/__fsetlocking.c: New file. * libio/__fwritable.c: New file. * libio/__fwriting.c: New file. * libio/stdio_ext.h: New file. * libio/genops.c (_IO_flush_all_linebuffered): Add alias _flushlbf. * libio/libio.h (_IO_USER_LOCK): Define. --- linuxthreads/ChangeLog | 7 ------- linuxthreads/lockfile.c | 11 +++-------- 2 files changed, 3 insertions(+), 15 deletions(-) (limited to 'linuxthreads') diff --git a/linuxthreads/ChangeLog b/linuxthreads/ChangeLog index 57bb848..e55344b 100644 --- a/linuxthreads/ChangeLog +++ b/linuxthreads/ChangeLog @@ -1,10 +1,3 @@ -2000-09-01 Ulrich Drepper - - * lockfile.c (__flockfile): If _IO_USER_LOCK bit is set don't do - anything. - (__funlockfile): Likewise. - (__ftrylockfile): If _IO_USER_LOCK bit is set return always 0. - 2000-08-30 Ulrich Drepper * manager.c (pthread_allocate_stack): Clear descriptor only if not diff --git a/linuxthreads/lockfile.c b/linuxthreads/lockfile.c index a7836b8..0ef02f8 100644 --- a/linuxthreads/lockfile.c +++ b/linuxthreads/lockfile.c @@ -29,8 +29,7 @@ void __flockfile (FILE *stream) { #ifdef USE_IN_LIBIO - if ((stream->_flags & _IO_USER_LOCK) == 0) - __pthread_mutex_lock (stream->_lock); + __pthread_mutex_lock (stream->_lock); #else #endif } @@ -45,8 +44,7 @@ void __funlockfile (FILE *stream) { #ifdef USE_IN_LIBIO - if ((stream->_flags & _IO_USER_LOCK) == 0) - __pthread_mutex_unlock (stream->_lock); + __pthread_mutex_unlock (stream->_lock); #else #endif } @@ -61,10 +59,7 @@ int __ftrylockfile (FILE *stream) { #ifdef USE_IN_LIBIO - if ((stream->_flags & _IO_USER_LOCK) == 0) - return __pthread_mutex_trylock (stream->_lock); - else - return 0; + return __pthread_mutex_trylock (stream->_lock); #else #endif } -- cgit v1.1