From c020d48c6e91b351cefebbc7a82a9c1ec2d9d83b Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Sat, 11 Aug 2001 05:19:24 +0000 Subject: Update. * libio/iovdprintf.c (_IO_vdprintf): Set _IO_USER_LOCK flag for temporary stream. Don't define lock. * libio/iovsprintf.c: Likewise. * libio/iovsnprintf.c: Likewise. * libio/iovswprintf.c: Likewise. * libio/iovsscanf.c: Likewise. * libio/iovswscanf.c: Likewise. * stdio-common/vfprintf.c [USE_IN_LIBIO] (buffered_vfprintf): Likewise. * libio/genops.c (_IO_no_init): Don't call _IO_lock_init if _lock is NULL. (_IO_default_finish): Likewise. * libio/wgenops.c (_IO_wdefault_finish): Likewise. --- libio/iovsprintf.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'libio/iovsprintf.c') diff --git a/libio/iovsprintf.c b/libio/iovsprintf.c index 1921fe5..ac1d9bd 100644 --- a/libio/iovsprintf.c +++ b/libio/iovsprintf.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1993, 1997, 1998, 1999, 2000 Free Software Foundation, Inc. +/* Copyright (C) 1993, 1997-2000, 2001 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -35,15 +35,12 @@ _IO_vsprintf (string, format, args) _IO_va_list args; { _IO_strfile sf; -#ifdef _IO_MTSAFE_IO - _IO_lock_t lock; -#endif int ret; #ifdef _IO_MTSAFE_IO - sf._sbf._f._lock = &lock; + sf._sbf._f._lock = NULL; #endif - _IO_no_init (&sf._sbf._f, 0, -1, NULL, NULL); + _IO_no_init (&sf._sbf._f, _IO_USER_LOCK, -1, NULL, NULL); _IO_JUMPS ((struct _IO_FILE_plus *) &sf._sbf) = &_IO_str_jumps; _IO_str_init_static (&sf, string, -1, string); ret = _IO_vfprintf ((_IO_FILE *) &sf._sbf, format, args); -- cgit v1.1