about summary refs log tree commit diff
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2005-08-09 01:27:20 +0000
committerUlrich Drepper <drepper@redhat.com>2005-08-09 01:27:20 +0000
commita7c684a235e60a2d30e75f59e2b11d4c50088090 (patch)
tree34a4cf4fb1df05fc677580e614ead4715e545b85
parentc9cc8e10836ea99641f4010efe42dc41312fa9ac (diff)
downloadglibc-a7c684a235e60a2d30e75f59e2b11d4c50088090.tar.gz
glibc-a7c684a235e60a2d30e75f59e2b11d4c50088090.tar.xz
glibc-a7c684a235e60a2d30e75f59e2b11d4c50088090.zip
* argp/argp-help.c: Use _IO_vasprintf instead of vasprintf.
	* include/stdio.h: Add libc_hidden_proto for __vfprintf_chk.
	* debug/vfprintf_chk.c: Add libc_hidden_def.
-rw-r--r--ChangeLog6
-rw-r--r--argp/argp-help.c7
-rw-r--r--include/stdio.h1
3 files changed, 11 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index e4424044e3..119cc8f43f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-08-08  Ulrich Drepper  <drepper@redhat.com>
+
+	* argp/argp-help.c: Use _IO_vasprintf instead of vasprintf.
+	* include/stdio.h: Add libc_hidden_proto for __vfprintf_chk.
+	* debug/vfprintf_chk.c: Add libc_hidden_def.
+
 2005-08-08  Roland McGrath  <roland@redhat.com>
 
 	* argp/argp-help.c (__argp_error): __asprintf -> vasprintf.
diff --git a/argp/argp-help.c b/argp/argp-help.c
index abd59c12f9..4bc4d07b15 100644
--- a/argp/argp-help.c
+++ b/argp/argp-help.c
@@ -48,7 +48,8 @@ char *alloca ();
 #include <stdarg.h>
 #include <ctype.h>
 #include <limits.h>
-#ifdef USE_IN_LIBIO
+#ifdef _LIBC
+# include <../libio/libioP.h>
 # include <wchar.h>
 #endif
 
@@ -1766,7 +1767,7 @@ __argp_error (const struct argp_state *state, const char *fmt, ...)
 #ifdef _LIBC
 	  char *buf;
 
-	  if (vasprintf (&buf, fmt, ap) < 0)
+	  if (_IO_vasprintf (&buf, fmt, ap) < 0)
 	    buf = NULL;
 
 	  __fxprintf (stream, "%s: %s\n",
@@ -1836,7 +1837,7 @@ __argp_failure (const struct argp_state *state, int status, int errnum,
 #ifdef _LIBC
 	      char *buf;
 
-	      if (vasprintf (&buf, fmt, ap) < 0)
+	      if (_IO_vasprintf (&buf, fmt, ap) < 0)
 		buf = NULL;
 
 	      __fxprintf (stream, ": %s", buf);
diff --git a/include/stdio.h b/include/stdio.h
index 9220db5b80..e040380d79 100644
--- a/include/stdio.h
+++ b/include/stdio.h
@@ -128,6 +128,7 @@ libc_hidden_proto (open_memstream)
 libc_hidden_proto (__libc_fatal)
 libc_hidden_proto (__vsprintf_chk)
 libc_hidden_proto (__vsnprintf_chk)
+libc_hidden_proto (__vfprintf_chk)
 
 #  if !defined NOT_IN_libc && defined SHARED && defined DO_VERSIONING \
   && defined HAVE_VISIBILITY_ATTRIBUTE && !defined HAVE_BROKEN_ALIAS_ATTRIBUTE\