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/vasprintf.c | |
| parent | 07ba7349279441bd084c8661a4e53c19cba12bf6 (diff) | |
| download | glibc-c020d48c6e91b351cefebbc7a82a9c1ec2d9d83b.tar glibc-c020d48c6e91b351cefebbc7a82a9c1ec2d9d83b.tar.gz glibc-c020d48c6e91b351cefebbc7a82a9c1ec2d9d83b.tar.bz2 glibc-c020d48c6e91b351cefebbc7a82a9c1ec2d9d83b.zip | |
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/vasprintf.c')
| -rw-r--r-- | libio/vasprintf.c | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/libio/vasprintf.c b/libio/vasprintf.c index 8dda7d9b1b..1cab48512e 100644 --- a/libio/vasprintf.c +++ b/libio/vasprintf.c @@ -43,9 +43,6 @@ _IO_vasprintf (result_ptr, format, args) const _IO_size_t init_string_size = 100; char *string; _IO_strfile sf; -#ifdef _IO_MTSAFE_IO - _IO_lock_t lock; -#endif int ret; _IO_size_t needed; _IO_size_t allocated; @@ -53,18 +50,15 @@ _IO_vasprintf (result_ptr, format, args) if (string == NULL) return -1; #ifdef _IO_MTSAFE_IO - sf._sbf._f._lock = &lock; + sf._sbf._f._lock = NULL; #endif - _IO_no_init ((_IO_FILE *) &sf._sbf, 0, -1, NULL, NULL); + _IO_no_init ((_IO_FILE *) &sf._sbf, _IO_USER_LOCK, -1, NULL, NULL); _IO_JUMPS ((struct _IO_FILE_plus *) &sf._sbf) = &_IO_str_jumps; _IO_str_init_static (&sf, string, init_string_size, string); sf._sbf._f._flags &= ~_IO_USER_BUF; sf._s._allocate_buffer = (_IO_alloc_type) malloc; sf._s._free_buffer = (_IO_free_type) free; -#ifdef _IO_MTSAFE_IO - __fsetlocking ((FILE *) &sf, FSETLOCKING_BYCALLER); -#endif - ret = _IO_vfprintf ((_IO_FILE *) &sf, format, args); + ret = _IO_vfprintf (&sf._sbf._f, format, args); if (ret < 0) return ret; /* Only use realloc if the size we need is of the same order of |