diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2001-08-11 05:19:24 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2001-08-11 05:19:24 +0000 |
| commit | c020d48c6e91b351cefebbc7a82a9c1ec2d9d83b (patch) | |
| tree | 28f297727c45d6197e23e00356713030cc9cc9fb /libio/iovswscanf.c | |
| parent | 07ba7349279441bd084c8661a4e53c19cba12bf6 (diff) | |
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.
Diffstat (limited to 'libio/iovswscanf.c')
| -rw-r--r-- | libio/iovswscanf.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/libio/iovswscanf.c b/libio/iovswscanf.c index 0bcd291433..dd7dbf8c37 100644 --- a/libio/iovswscanf.c +++ b/libio/iovswscanf.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 @@ -39,10 +39,9 @@ vswscanf (string, format, args) _IO_strfile sf; struct _IO_wide_data wd; #ifdef _IO_MTSAFE_IO - _IO_lock_t lock; - sf._sbf._f._lock = &lock; + sf._sbf._f._lock = NULL; #endif - _IO_no_init (&sf._sbf._f, 0, 0, &wd, &_IO_wstr_jumps); + _IO_no_init (&sf._sbf._f, _IO_USER_LOCK, 0, &wd, &_IO_wstr_jumps); _IO_fwide (&sf._sbf._f, 1); _IO_wstr_init_static (&sf._sbf._f, (wchar_t *)string, 0, NULL); ret = _IO_vfwscanf ((_IO_FILE *) &sf._sbf, format, args, NULL); |