aboutsummaryrefslogtreecommitdiff
path: root/libio/vsnprintf.c
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2001-08-11 05:19:24 +0000
committerUlrich Drepper <drepper@redhat.com>2001-08-11 05:19:24 +0000
commitc020d48c6e91b351cefebbc7a82a9c1ec2d9d83b (patch)
tree28f297727c45d6197e23e00356713030cc9cc9fb /libio/vsnprintf.c
parent07ba7349279441bd084c8661a4e53c19cba12bf6 (diff)
downloadglibc-c020d48c6e91b351cefebbc7a82a9c1ec2d9d83b.zip
glibc-c020d48c6e91b351cefebbc7a82a9c1ec2d9d83b.tar.gz
glibc-c020d48c6e91b351cefebbc7a82a9c1ec2d9d83b.tar.bz2
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/vsnprintf.c')
-rw-r--r--libio/vsnprintf.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/libio/vsnprintf.c b/libio/vsnprintf.c
index fe45c62..f356902 100644
--- a/libio/vsnprintf.c
+++ b/libio/vsnprintf.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1994, 1997, 1999, 2000 Free Software Foundation, Inc.
+/* Copyright (C) 1994, 1997, 1999, 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
@@ -112,8 +112,7 @@ _IO_vsnprintf (string, maxlen, format, args)
_IO_strnfile sf;
int ret;
#ifdef _IO_MTSAFE_IO
- _IO_lock_t lock;
- sf.f._sbf._f._lock = &lock;
+ sf.f._sbf._f._lock = NULL;
#endif
/* We need to handle the special case where MAXLEN is 0. Use the
@@ -124,7 +123,7 @@ _IO_vsnprintf (string, maxlen, format, args)
maxlen = sizeof (sf.overflow_buf);
}
- _IO_no_init (&sf.f._sbf._f, 0, -1, NULL, NULL);
+ _IO_no_init (&sf.f._sbf._f, _IO_USER_LOCK, -1, NULL, NULL);
_IO_JUMPS ((struct _IO_FILE_plus *) &sf.f._sbf) = &_IO_strn_jumps;
string[0] = '\0';
_IO_str_init_static (&sf.f, string, maxlen - 1, string);