From 0ff63017b40dda207b2aadc9881e0c93e7fd2753 Mon Sep 17 00:00:00 2001 From: jb Date: Sat, 11 Apr 1998 07:40:47 +0000 Subject: 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. --- lib/libc/stdio/vscanf.c | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) (limited to 'lib/libc/stdio/vscanf.c') diff --git a/lib/libc/stdio/vscanf.c b/lib/libc/stdio/vscanf.c index 9381710..729098b 100644 --- a/lib/libc/stdio/vscanf.c +++ b/lib/libc/stdio/vscanf.c @@ -39,14 +39,11 @@ static char sccsid[] = "@(#)vscanf.c 8.1 (Berkeley) 6/4/93"; #endif static const char rcsid[] = - "$Id$"; + "$Id: vscanf.c,v 1.5 1997/02/22 15:02:43 peter Exp $"; #endif /* LIBC_SCCS and not lint */ #include -#ifdef _THREAD_SAFE -#include -#include "pthread_private.h" -#endif +#include "libc_private.h" int vscanf(fmt, ap) @@ -55,12 +52,8 @@ vscanf(fmt, ap) { int retval; -#ifdef _THREAD_SAFE - _thread_flockfile(stdin,__FILE__,__LINE__); -#endif + FLOCKFILE(stdin); retval = __svfscanf(stdin, fmt, ap); -#ifdef _THREAD_SAFE - _thread_funlockfile(stdin); -#endif + FUNLOCKFILE(stdin); return (retval); } -- cgit v1.1