|
 |
b9ba6d |
2010-12-10 Andreas Schwab <schwab@redhat.com>
|
|
|
b9ba6d |
|
|
|
b9ba6d |
* wcsmbs/wchar.h (wcpcpy, wcpncpy): Only declare under
|
|
|
b9ba6d |
_GNU_SOURCE.
|
|
|
b9ba6d |
|
|
|
b9ba6d |
2010-12-10 Andreas Schwab <schwab@redhat.com>
|
|
|
b9ba6d |
|
|
|
b9ba6d |
* wcsmbs/wchar.h (wcpcpy, wcpncpy): Add __restrict.
|
|
|
b9ba6d |
* wcsmbs/bits/wchar2.h (__wmemmove_chk_warn, wmemmove, wmemset):
|
|
|
b9ba6d |
Remove __restrict.
|
|
|
b9ba6d |
(wcscpy, __wcpcpy_chk, __wcpcpy_alias, wcpcpy, wcsncpy, wcpncpy)
|
|
|
b9ba6d |
(wcscat, wcsncat, __wcrtomb_chk, wcrtomb): Add __restrict.
|
|
|
b9ba6d |
|
|
|
b9ba6d |
2010-12-09 Jakub Jelinek <jakub@redhat.com>
|
|
|
b9ba6d |
|
|
|
b9ba6d |
* string/bits/string3.h (memmove, bcopy): Remove __restrict.
|
|
|
b9ba6d |
|
|
|
b9ba6d |
Index: glibc-2.12-2-gc4ccff1/string/bits/string3.h
|
|
|
b9ba6d |
===================================================================
|
|
|
b9ba6d |
--- glibc-2.12-2-gc4ccff1.orig/string/bits/string3.h
|
|
|
b9ba6d |
+++ glibc-2.12-2-gc4ccff1/string/bits/string3.h
|
|
|
b9ba6d |
@@ -53,8 +53,7 @@ __NTH (memcpy (void *__restrict __dest,
|
|
|
b9ba6d |
}
|
|
|
b9ba6d |
|
|
|
b9ba6d |
__extern_always_inline void *
|
|
|
b9ba6d |
-__NTH (memmove (void *__restrict __dest, __const void *__restrict __src,
|
|
|
b9ba6d |
- size_t __len))
|
|
|
b9ba6d |
+__NTH (memmove (void *__dest, __const void *__src, size_t __len))
|
|
|
b9ba6d |
{
|
|
|
b9ba6d |
return __builtin___memmove_chk (__dest, __src, __len, __bos0 (__dest));
|
|
|
b9ba6d |
}
|
|
|
b9ba6d |
@@ -88,8 +87,7 @@ __NTH (memset (void *__dest, int __ch, s
|
|
|
b9ba6d |
|
|
|
b9ba6d |
#ifdef __USE_BSD
|
|
|
b9ba6d |
__extern_always_inline void
|
|
|
b9ba6d |
-__NTH (bcopy (__const void *__restrict __src, void *__restrict __dest,
|
|
|
b9ba6d |
- size_t __len))
|
|
|
b9ba6d |
+__NTH (bcopy (__const void *__src, void *__dest, size_t __len))
|
|
|
b9ba6d |
{
|
|
|
b9ba6d |
(void) __builtin___memmove_chk (__dest, __src, __len, __bos0 (__dest));
|
|
|
b9ba6d |
}
|
|
|
b9ba6d |
Index: glibc-2.12-2-gc4ccff1/wcsmbs/bits/wchar2.h
|
|
|
b9ba6d |
===================================================================
|
|
|
b9ba6d |
--- glibc-2.12-2-gc4ccff1.orig/wcsmbs/bits/wchar2.h
|
|
|
b9ba6d |
+++ glibc-2.12-2-gc4ccff1/wcsmbs/bits/wchar2.h
|
|
|
b9ba6d |
@@ -60,15 +60,13 @@ extern wchar_t *__REDIRECT_NTH (__wmemmo
|
|
|
b9ba6d |
__const wchar_t *__s2,
|
|
|
b9ba6d |
size_t __n), wmemmove);
|
|
|
b9ba6d |
extern wchar_t *__REDIRECT_NTH (__wmemmove_chk_warn,
|
|
|
b9ba6d |
- (wchar_t *__restrict __s1,
|
|
|
b9ba6d |
- __const wchar_t *__restrict __s2, size_t __n,
|
|
|
b9ba6d |
- size_t __ns1), __wmemmove_chk)
|
|
|
b9ba6d |
+ (wchar_t *__s1, __const wchar_t *__s2,
|
|
|
b9ba6d |
+ size_t __n, size_t __ns1), __wmemmove_chk)
|
|
|
b9ba6d |
__warnattr ("wmemmove called with length bigger than size of destination "
|
|
|
b9ba6d |
"buffer");
|
|
|
b9ba6d |
|
|
|
b9ba6d |
__extern_always_inline wchar_t *
|
|
|
b9ba6d |
-__NTH (wmemmove (wchar_t *__restrict __s1, __const wchar_t *__restrict __s2,
|
|
|
b9ba6d |
- size_t __n))
|
|
|
b9ba6d |
+__NTH (wmemmove (wchar_t *__s1, __const wchar_t *__s2, size_t __n))
|
|
|
b9ba6d |
{
|
|
|
b9ba6d |
if (__bos0 (__s1) != (size_t) -1)
|
|
|
b9ba6d |
{
|
|
|
b9ba6d |
@@ -129,7 +127,7 @@ extern wchar_t *__REDIRECT_NTH (__wmemse
|
|
|
b9ba6d |
"buffer");
|
|
|
b9ba6d |
|
|
|
b9ba6d |
__extern_always_inline wchar_t *
|
|
|
b9ba6d |
-__NTH (wmemset (wchar_t *__restrict __s, wchar_t __c, size_t __n))
|
|
|
b9ba6d |
+__NTH (wmemset (wchar_t *__s, wchar_t __c, size_t __n))
|
|
|
b9ba6d |
{
|
|
|
b9ba6d |
if (__bos0 (__s) != (size_t) -1)
|
|
|
b9ba6d |
{
|
|
|
b9ba6d |
@@ -152,7 +150,7 @@ extern wchar_t *__REDIRECT_NTH (__wcscpy
|
|
|
b9ba6d |
__const wchar_t *__restrict __src), wcscpy);
|
|
|
b9ba6d |
|
|
|
b9ba6d |
__extern_always_inline wchar_t *
|
|
|
b9ba6d |
-__NTH (wcscpy (wchar_t *__dest, __const wchar_t *__src))
|
|
|
b9ba6d |
+__NTH (wcscpy (wchar_t *__restrict __dest, __const wchar_t *__restrict __src))
|
|
|
b9ba6d |
{
|
|
|
b9ba6d |
if (__bos (__dest) != (size_t) -1)
|
|
|
b9ba6d |
return __wcscpy_chk (__dest, __src, __bos (__dest) / sizeof (wchar_t));
|
|
|
b9ba6d |
@@ -160,14 +158,15 @@ __NTH (wcscpy (wchar_t *__dest, __const
|
|
|
b9ba6d |
}
|
|
|
b9ba6d |
|
|
|
b9ba6d |
|
|
|
b9ba6d |
-extern wchar_t *__wcpcpy_chk (wchar_t *__dest, __const wchar_t *__src,
|
|
|
b9ba6d |
+extern wchar_t *__wcpcpy_chk (wchar_t *__restrict __dest,
|
|
|
b9ba6d |
+ __const wchar_t *__restrict __src,
|
|
|
b9ba6d |
size_t __destlen) __THROW;
|
|
|
b9ba6d |
-extern wchar_t *__REDIRECT_NTH (__wcpcpy_alias, (wchar_t *__dest,
|
|
|
b9ba6d |
- __const wchar_t *__src),
|
|
|
b9ba6d |
- wcpcpy);
|
|
|
b9ba6d |
+extern wchar_t *__REDIRECT_NTH (__wcpcpy_alias,
|
|
|
b9ba6d |
+ (wchar_t *__restrict __dest,
|
|
|
b9ba6d |
+ __const wchar_t *__restrict __src), wcpcpy);
|
|
|
b9ba6d |
|
|
|
b9ba6d |
__extern_always_inline wchar_t *
|
|
|
b9ba6d |
-__NTH (wcpcpy (wchar_t *__dest, __const wchar_t *__src))
|
|
|
b9ba6d |
+__NTH (wcpcpy (wchar_t *__restrict __dest, __const wchar_t *__restrict __src))
|
|
|
b9ba6d |
{
|
|
|
b9ba6d |
if (__bos (__dest) != (size_t) -1)
|
|
|
b9ba6d |
return __wcpcpy_chk (__dest, __src, __bos (__dest) / sizeof (wchar_t));
|
|
|
b9ba6d |
@@ -190,7 +189,8 @@ extern wchar_t *__REDIRECT_NTH (__wcsncp
|
|
|
b9ba6d |
"buffer");
|
|
|
b9ba6d |
|
|
|
b9ba6d |
__extern_always_inline wchar_t *
|
|
|
b9ba6d |
-__NTH (wcsncpy (wchar_t *__dest, __const wchar_t *__src, size_t __n))
|
|
|
b9ba6d |
+__NTH (wcsncpy (wchar_t *__restrict __dest, __const wchar_t *__restrict __src,
|
|
|
b9ba6d |
+ size_t __n))
|
|
|
b9ba6d |
{
|
|
|
b9ba6d |
if (__bos (__dest) != (size_t) -1)
|
|
|
b9ba6d |
{
|
|
|
b9ba6d |
@@ -220,7 +220,8 @@ extern wchar_t *__REDIRECT_NTH (__wcpncp
|
|
|
b9ba6d |
"buffer");
|
|
|
b9ba6d |
|
|
|
b9ba6d |
__extern_always_inline wchar_t *
|
|
|
b9ba6d |
-__NTH (wcpncpy (wchar_t *__dest, __const wchar_t *__src, size_t __n))
|
|
|
b9ba6d |
+__NTH (wcpncpy (wchar_t *__restrict __dest, __const wchar_t *__restrict __src,
|
|
|
b9ba6d |
+ size_t __n))
|
|
|
b9ba6d |
{
|
|
|
b9ba6d |
if (__bos (__dest) != (size_t) -1)
|
|
|
b9ba6d |
{
|
|
|
b9ba6d |
@@ -243,7 +244,7 @@ extern wchar_t *__REDIRECT_NTH (__wcscat
|
|
|
b9ba6d |
__const wchar_t *__restrict __src), wcscat);
|
|
|
b9ba6d |
|
|
|
b9ba6d |
__extern_always_inline wchar_t *
|
|
|
b9ba6d |
-__NTH (wcscat (wchar_t *__dest, __const wchar_t *__src))
|
|
|
b9ba6d |
+__NTH (wcscat (wchar_t *__restrict __dest, __const wchar_t *__restrict __src))
|
|
|
b9ba6d |
{
|
|
|
b9ba6d |
if (__bos (__dest) != (size_t) -1)
|
|
|
b9ba6d |
return __wcscat_chk (__dest, __src, __bos (__dest) / sizeof (wchar_t));
|
|
|
b9ba6d |
@@ -260,7 +261,8 @@ extern wchar_t *__REDIRECT_NTH (__wcsnca
|
|
|
b9ba6d |
size_t __n), wcsncat);
|
|
|
b9ba6d |
|
|
|
b9ba6d |
__extern_always_inline wchar_t *
|
|
|
b9ba6d |
-__NTH (wcsncat (wchar_t *__dest, __const wchar_t *__src, size_t __n))
|
|
|
b9ba6d |
+__NTH (wcsncat (wchar_t *__restrict __dest, __const wchar_t *__restrict __src,
|
|
|
b9ba6d |
+ size_t __n))
|
|
|
b9ba6d |
{
|
|
|
b9ba6d |
if (__bos (__dest) != (size_t) -1)
|
|
|
b9ba6d |
return __wcsncat_chk (__dest, __src, __n,
|
|
|
b9ba6d |
@@ -428,14 +430,16 @@ fgetws_unlocked (wchar_t *__restrict __s
|
|
|
b9ba6d |
#endif
|
|
|
b9ba6d |
|
|
|
b9ba6d |
|
|
|
b9ba6d |
-extern size_t __wcrtomb_chk (char *__s, wchar_t __wchar, mbstate_t *__p,
|
|
|
b9ba6d |
- size_t __buflen) __THROW __wur;
|
|
|
b9ba6d |
+extern size_t __wcrtomb_chk (char *__restrict __s, wchar_t __wchar,
|
|
|
b9ba6d |
+ mbstate_t *__restrict __p,
|
|
|
b9ba6d |
+ size_t __buflen) __THROW __wur;
|
|
|
b9ba6d |
extern size_t __REDIRECT_NTH (__wcrtomb_alias,
|
|
|
b9ba6d |
(char *__restrict __s, wchar_t __wchar,
|
|
|
b9ba6d |
mbstate_t *__restrict __ps), wcrtomb) __wur;
|
|
|
b9ba6d |
|
|
|
b9ba6d |
__extern_always_inline __wur size_t
|
|
|
b9ba6d |
-__NTH (wcrtomb (char *__s, wchar_t __wchar, mbstate_t *__ps))
|
|
|
b9ba6d |
+__NTH (wcrtomb (char *__restrict __s, wchar_t __wchar,
|
|
|
b9ba6d |
+ mbstate_t *__restrict __ps))
|
|
|
b9ba6d |
{
|
|
|
b9ba6d |
/* We would have to include <limits.h> to get a definition of MB_LEN_MAX.
|
|
|
b9ba6d |
But this would only disturb the namespace. So we define our own
|
|
|
b9ba6d |
Index: glibc-2.12-2-gc4ccff1/wcsmbs/wchar.h
|
|
|
b9ba6d |
===================================================================
|
|
|
b9ba6d |
--- glibc-2.12-2-gc4ccff1.orig/wcsmbs/wchar.h
|
|
|
b9ba6d |
+++ glibc-2.12-2-gc4ccff1/wcsmbs/wchar.h
|
|
|
b9ba6d |
@@ -555,17 +555,17 @@ extern float wcstof_l (__const wchar_t *
|
|
|
b9ba6d |
extern long double wcstold_l (__const wchar_t *__restrict __nptr,
|
|
|
b9ba6d |
wchar_t **__restrict __endptr,
|
|
|
b9ba6d |
__locale_t __loc) __THROW;
|
|
|
b9ba6d |
-#endif /* GNU */
|
|
|
b9ba6d |
|
|
|
b9ba6d |
|
|
|
b9ba6d |
-#ifdef __USE_XOPEN2K8
|
|
|
b9ba6d |
/* Copy SRC to DEST, returning the address of the terminating L'\0' in
|
|
|
b9ba6d |
DEST. */
|
|
|
b9ba6d |
-extern wchar_t *wcpcpy (wchar_t *__dest, __const wchar_t *__src) __THROW;
|
|
|
b9ba6d |
+extern wchar_t *wcpcpy (wchar_t *__restrict __dest,
|
|
|
b9ba6d |
+ __const wchar_t *__restrict __src) __THROW;
|
|
|
b9ba6d |
|
|
|
b9ba6d |
/* Copy no more than N characters of SRC to DEST, returning the address of
|
|
|
b9ba6d |
the last character written into DEST. */
|
|
|
b9ba6d |
-extern wchar_t *wcpncpy (wchar_t *__dest, __const wchar_t *__src, size_t __n)
|
|
|
b9ba6d |
+extern wchar_t *wcpncpy (wchar_t *__restrict __dest,
|
|
|
b9ba6d |
+ __const wchar_t *__restrict __src, size_t __n)
|
|
|
b9ba6d |
__THROW;
|
|
|
b9ba6d |
#endif /* use GNU */
|
|
|
b9ba6d |
|