diff options
| author | jb <jb@FreeBSD.org> | 1998-04-11 07:40:47 +0000 |
|---|---|---|
| committer | jb <jb@FreeBSD.org> | 1998-04-11 07:40:47 +0000 |
| commit | 0ff63017b40dda207b2aadc9881e0c93e7fd2753 (patch) | |
| tree | 4819eff8a5c9bc5ae04aaf772d0d5b4f7bfaaebc /lib/libc/stdio/scanf.c | |
| parent | 525c97c21dbcb3fd61a8a530a3f8df5e901bf1ab (diff) | |
| download | FreeBSD-src-0ff63017b40dda207b2aadc9881e0c93e7fd2753.zip FreeBSD-src-0ff63017b40dda207b2aadc9881e0c93e7fd2753.tar.gz | |
Add FILE locking stubs for libc.
Change the FILE locking to support kernel threads when linked with
libpthread (which you haven't see yet). This requires that libc become
thread-safe and thread-aware, testing __isthreaded before attempting
to do lock/unlock calls. The impact on non-threaded programs is minor.
This change works with libc_r, so it's the best compromise.
Diffstat (limited to 'lib/libc/stdio/scanf.c')
| -rw-r--r-- | lib/libc/stdio/scanf.c | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/lib/libc/stdio/scanf.c b/lib/libc/stdio/scanf.c index 7a8bd65..94f77be 100644 --- a/lib/libc/stdio/scanf.c +++ b/lib/libc/stdio/scanf.c @@ -39,7 +39,7 @@ static char sccsid[] = "@(#)scanf.c 8.1 (Berkeley) 6/4/93"; #endif static const char rcsid[] = - "$Id$"; + "$Id: scanf.c,v 1.5 1997/02/22 15:02:25 peter Exp $"; #endif /* LIBC_SCCS and not lint */ #include <stdio.h> @@ -48,10 +48,7 @@ static const char rcsid[] = #else #include <varargs.h> #endif -#ifdef _THREAD_SAFE -#include <pthread.h> -#include "pthread_private.h" -#endif +#include "libc_private.h" #if __STDC__ int @@ -71,13 +68,9 @@ scanf(fmt, va_alist) #else va_start(ap); #endif -#ifdef _THREAD_SAFE - _thread_flockfile(stdin,__FILE__,__LINE__); -#endif + FLOCKFILE(stdin); ret = __svfscanf(stdin, fmt, ap); + FUNLOCKFILE(stdin); va_end(ap); -#ifdef _THREAD_SAFE - _thread_funlockfile(stdin); -#endif return (ret); } |
