OpenE2K
/
glibc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

* 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.
This commit is contained in:
Ulrich Drepper 2005-07-21 16:23:54 +00:00
parent 35476e9cd7
commit 757beee151
5 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ChangeLog
View File

@ -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.

2
debug/getgroups_chk.c
View File

@ -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))

4
debug/tst-chk1.c
View File

@ -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);

1
stdio-common/fxprintf.c
View File

@ -22,6 +22,7 @@
#include <stdarg.h>
#include <stdio.h>
#include <wchar.h>
#include <string.h>
int

7
wcsmbs/bits/wchar2.h
View File

@ -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,