diff options
| author |   Thomas Bushnell, BSG <thomas@gnu.org> | 1996-09-12 22:22:29 +0000 |
|---|---|---|
| committer | Thomas Bushnell, BSG <thomas@gnu.org> | 1996-09-12 22:22:29 +0000 |
| commit | ae2ddc98c17c17897398c8d960d984789ecab0d9 (patch) | |
| tree | 0cc8f727ebaac4445fb9420043c1fcea61c82a24 /stdio-common | |
| parent | *** empty log message *** (diff) | |
| download | glibc-ae2ddc98c17c17897398c8d960d984789ecab0d9.tar.gz glibc-ae2ddc98c17c17897398c8d960d984789ecab0d9.tar.bz2 glibc-ae2ddc98c17c17897398c8d960d984789ecab0d9.zip | |
*** empty log message ***
(vfprintf): Only call __libc_cleanup_region_end if USE_IN_LIBIO,
thus matching the sense of the tests around
__libc_cleanup_region_start at the front of the function.
* stdio-common/vfscanf.c: Include <libc-lock.h>.
(UNLOCK_STREAM) [! USE_IN_LIBIO]: Call
__libc_cleanup_region_end, not __libc_cleanup_region_start.
Diffstat (limited to 'stdio-common')
| -rw-r--r-- | stdio-common/vfprintf.c | 3 | ||||
| -rw-r--r-- | stdio-common/vfscanf.c | 3 |
2 files changed, 5 insertions, 1 deletions
diff --git a/stdio-common/vfprintf.c b/stdio-common/vfprintf.c index d27bbdbf57..dc2983d264 100644 --- a/stdio-common/vfprintf.c +++ b/stdio-common/vfprintf.c @@ -1311,7 +1311,10 @@ do_positional: all_done: /* Unlock the stream. */ +#ifdef USE_IN_LIBIO + /* (stdio has no locking yet.) */ __libc_cleanup_region_end (1); +#endif return done; } diff --git a/stdio-common/vfscanf.c b/stdio-common/vfscanf.c index 903f5849cc..f83fd281a1 100644 --- a/stdio-common/vfscanf.c +++ b/stdio-common/vfscanf.c @@ -24,6 +24,7 @@ Cambridge, MA 02139, USA. */ #include <stdio.h> #include <stdlib.h> #include <string.h> +#include <libc-lock.h> #ifdef __GNUC__ #define HAVE_LONGLONG @@ -119,7 +120,7 @@ Cambridge, MA 02139, USA. */ # define LOCK_STREAM(S) \ __libc_cleanup_region_start (&__funlockfile, (S)); \ __flockfile (S) -# define UNLOCK_STREAM __libc_cleanup_region_start (1) +# define UNLOCK_STREAM __libc_cleanup_region_end (1) #endif #endif |