about summary refs log tree commit diff
path: root/wcsmbs/bits
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2005-07-21 16:23:54 +0000
committerUlrich Drepper <drepper@redhat.com>2005-07-21 16:23:54 +0000
commit757beee151f9f56be2e49f7a82abc8a58734bca2 (patch)
treea378e0e8fc9a72b760e82c027dd6ab101546c33b /wcsmbs/bits
parent35476e9cd7d61290ecdc4a75496df6a36f22a005 (diff)
downloadglibc-757beee151f9f56be2e49f7a82abc8a58734bca2.tar.gz
glibc-757beee151f9f56be2e49f7a82abc8a58734bca2.tar.xz
glibc-757beee151f9f56be2e49f7a82abc8a58734bca2.zip
* wcsmbs/bits/wchar2.h (swprintf): Remove format argument.
	* debug/tst-chk1.c (do_test): Add test for swprintf with format
	being the last argument.

2005-07-21  Thorsten Kukuk  <kukuk@suse.de>

	* debug/getgroups_chk.c (__getgroups_chk): Fix return value.

	* stdio-common/fxprintf.c: Include string.h.
Diffstat (limited to 'wcsmbs/bits')
-rw-r--r--wcsmbs/bits/wchar2.h7
1 files changed, 3 insertions, 4 deletions
diff --git a/wcsmbs/bits/wchar2.h b/wcsmbs/bits/wchar2.h
index c102948f11..8dd5b88014 100644
--- a/wcsmbs/bits/wchar2.h
+++ b/wcsmbs/bits/wchar2.h
@@ -199,11 +199,10 @@ extern int __swprintf_chk (wchar_t *__restrict __s, size_t __n,
      __THROW /* __attribute__ ((__format__ (__wprintf__, 5, 6))) */;
 
 /* XXX We might want to have support in gcc for swprintf.  */
-#define swprintf(s, n, format, ...) \
+#define swprintf(s, n, ...) \
   (__bos (s) != (size_t) -1 || __USE_FORTIFY_LEVEL > 1			      \
-   ? __swprintf_chk (s, n, __USE_FORTIFY_LEVEL - 1, __bos (s), format,	      \
-		     __VA_ARGS__)					      \
-   : swprintf (s, n, format, __VA_ARGS__))
+   ? __swprintf_chk (s, n, __USE_FORTIFY_LEVEL - 1, __bos (s), __VA_ARGS__)   \
+   : swprintf (s, n, __VA_ARGS__))
 
 
 extern int __vswprintf_chk (wchar_t *__restrict __s, size_t __n,