diff options
| -rw-r--r-- | ChangeLog | 12 | ||||
| -rw-r--r-- | debug/getgroups_chk.c | 2 | ||||
| -rw-r--r-- | debug/tst-chk1.c | 4 | ||||
| -rw-r--r-- | stdio-common/fxprintf.c | 1 | ||||
| -rw-r--r-- | wcsmbs/bits/wchar2.h | 7 |
5 files changed, 21 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog index b0370d91c4..cea55995cc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,15 @@ +2005-07-21 Jakub Jelinek <jakub@redhat.com> + + * 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. + 2005-07-20 Ulrich Drepper <drepper@redhat.com> * sysdeps/x86_64/fpu/libm-test-ulps: Adjust expected atan2f results. diff --git a/debug/getgroups_chk.c b/debug/getgroups_chk.c index 6401b023d3..c877ddb9ca 100644 --- a/debug/getgroups_chk.c +++ b/debug/getgroups_chk.c @@ -20,7 +20,7 @@ #include <unistd.h> -char * +int __getgroups_chk (int size, __gid_t list[], size_t listlen) { if (__builtin_expect (size * sizeof (__gid_t) > listlen, 0)) diff --git a/debug/tst-chk1.c b/debug/tst-chk1.c index 62b0fa6f40..755052c52b 100644 --- a/debug/tst-chk1.c +++ b/debug/tst-chk1.c @@ -403,6 +403,10 @@ do_test (void) || wmemcmp (wbuf, L"aabcEDX98", 10)) FAIL (); + if (swprintf (wbuf + 7, 3, L"64") != 2 + || wmemcmp (wbuf, L"aabcEDX64", 10)) + FAIL (); + /* These ops need runtime checking, but shouldn't __chk_fail. */ wmemcpy (wbuf, L"abcdefghij", l0 + 10); wmemmove (wbuf + 1, wbuf, l0 + 9); diff --git a/stdio-common/fxprintf.c b/stdio-common/fxprintf.c index 298e5f22b0..3b3cc5cdda 100644 --- a/stdio-common/fxprintf.c +++ b/stdio-common/fxprintf.c @@ -22,6 +22,7 @@ #include <stdarg.h> #include <stdio.h> #include <wchar.h> +#include <string.h> int 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, |