1 2010-12-10 Andreas Schwab <schwab@redhat.com>
3 * wcsmbs/wchar.h (wcpcpy, wcpncpy): Only declare under
6 2010-12-10 Andreas Schwab <schwab@redhat.com>
8 * wcsmbs/wchar.h (wcpcpy, wcpncpy): Add __restrict.
9 * wcsmbs/bits/wchar2.h (__wmemmove_chk_warn, wmemmove, wmemset):
11 (wcscpy, __wcpcpy_chk, __wcpcpy_alias, wcpcpy, wcsncpy, wcpncpy)
12 (wcscat, wcsncat, __wcrtomb_chk, wcrtomb): Add __restrict.
14 2010-12-09 Jakub Jelinek <jakub@redhat.com>
16 * string/bits/string3.h (memmove, bcopy): Remove __restrict.
18 Index: glibc-2.12-2-gc4ccff1/string/bits/string3.h
19 ===================================================================
20 --- glibc-2.12-2-gc4ccff1.orig/string/bits/string3.h
21 +++ glibc-2.12-2-gc4ccff1/string/bits/string3.h
22 @@ -53,8 +53,7 @@ __NTH (memcpy (void *__restrict __dest,
25 __extern_always_inline void *
26 -__NTH (memmove (void *__restrict __dest, __const void *__restrict __src,
28 +__NTH (memmove (void *__dest, __const void *__src, size_t __len))
30 return __builtin___memmove_chk (__dest, __src, __len, __bos0 (__dest));
32 @@ -88,8 +87,7 @@ __NTH (memset (void *__dest, int __ch, s
35 __extern_always_inline void
36 -__NTH (bcopy (__const void *__restrict __src, void *__restrict __dest,
38 +__NTH (bcopy (__const void *__src, void *__dest, size_t __len))
40 (void) __builtin___memmove_chk (__dest, __src, __len, __bos0 (__dest));
42 Index: glibc-2.12-2-gc4ccff1/wcsmbs/bits/wchar2.h
43 ===================================================================
44 --- glibc-2.12-2-gc4ccff1.orig/wcsmbs/bits/wchar2.h
45 +++ glibc-2.12-2-gc4ccff1/wcsmbs/bits/wchar2.h
46 @@ -60,15 +60,13 @@ extern wchar_t *__REDIRECT_NTH (__wmemmo
47 __const wchar_t *__s2,
48 size_t __n), wmemmove);
49 extern wchar_t *__REDIRECT_NTH (__wmemmove_chk_warn,
50 - (wchar_t *__restrict __s1,
51 - __const wchar_t *__restrict __s2, size_t __n,
52 - size_t __ns1), __wmemmove_chk)
53 + (wchar_t *__s1, __const wchar_t *__s2,
54 + size_t __n, size_t __ns1), __wmemmove_chk)
55 __warnattr ("wmemmove called with length bigger than size of destination "
58 __extern_always_inline wchar_t *
59 -__NTH (wmemmove (wchar_t *__restrict __s1, __const wchar_t *__restrict __s2,
61 +__NTH (wmemmove (wchar_t *__s1, __const wchar_t *__s2, size_t __n))
63 if (__bos0 (__s1) != (size_t) -1)
65 @@ -129,7 +127,7 @@ extern wchar_t *__REDIRECT_NTH (__wmemse
68 __extern_always_inline wchar_t *
69 -__NTH (wmemset (wchar_t *__restrict __s, wchar_t __c, size_t __n))
70 +__NTH (wmemset (wchar_t *__s, wchar_t __c, size_t __n))
72 if (__bos0 (__s) != (size_t) -1)
74 @@ -152,7 +150,7 @@ extern wchar_t *__REDIRECT_NTH (__wcscpy
75 __const wchar_t *__restrict __src), wcscpy);
77 __extern_always_inline wchar_t *
78 -__NTH (wcscpy (wchar_t *__dest, __const wchar_t *__src))
79 +__NTH (wcscpy (wchar_t *__restrict __dest, __const wchar_t *__restrict __src))
81 if (__bos (__dest) != (size_t) -1)
82 return __wcscpy_chk (__dest, __src, __bos (__dest) / sizeof (wchar_t));
83 @@ -160,14 +158,15 @@ __NTH (wcscpy (wchar_t *__dest, __const
87 -extern wchar_t *__wcpcpy_chk (wchar_t *__dest, __const wchar_t *__src,
88 +extern wchar_t *__wcpcpy_chk (wchar_t *__restrict __dest,
89 + __const wchar_t *__restrict __src,
90 size_t __destlen) __THROW;
91 -extern wchar_t *__REDIRECT_NTH (__wcpcpy_alias, (wchar_t *__dest,
92 - __const wchar_t *__src),
94 +extern wchar_t *__REDIRECT_NTH (__wcpcpy_alias,
95 + (wchar_t *__restrict __dest,
96 + __const wchar_t *__restrict __src), wcpcpy);
98 __extern_always_inline wchar_t *
99 -__NTH (wcpcpy (wchar_t *__dest, __const wchar_t *__src))
100 +__NTH (wcpcpy (wchar_t *__restrict __dest, __const wchar_t *__restrict __src))
102 if (__bos (__dest) != (size_t) -1)
103 return __wcpcpy_chk (__dest, __src, __bos (__dest) / sizeof (wchar_t));
104 @@ -190,7 +189,8 @@ extern wchar_t *__REDIRECT_NTH (__wcsncp
107 __extern_always_inline wchar_t *
108 -__NTH (wcsncpy (wchar_t *__dest, __const wchar_t *__src, size_t __n))
109 +__NTH (wcsncpy (wchar_t *__restrict __dest, __const wchar_t *__restrict __src,
112 if (__bos (__dest) != (size_t) -1)
114 @@ -220,7 +220,8 @@ extern wchar_t *__REDIRECT_NTH (__wcpncp
117 __extern_always_inline wchar_t *
118 -__NTH (wcpncpy (wchar_t *__dest, __const wchar_t *__src, size_t __n))
119 +__NTH (wcpncpy (wchar_t *__restrict __dest, __const wchar_t *__restrict __src,
122 if (__bos (__dest) != (size_t) -1)
124 @@ -243,7 +244,7 @@ extern wchar_t *__REDIRECT_NTH (__wcscat
125 __const wchar_t *__restrict __src), wcscat);
127 __extern_always_inline wchar_t *
128 -__NTH (wcscat (wchar_t *__dest, __const wchar_t *__src))
129 +__NTH (wcscat (wchar_t *__restrict __dest, __const wchar_t *__restrict __src))
131 if (__bos (__dest) != (size_t) -1)
132 return __wcscat_chk (__dest, __src, __bos (__dest) / sizeof (wchar_t));
133 @@ -260,7 +261,8 @@ extern wchar_t *__REDIRECT_NTH (__wcsnca
134 size_t __n), wcsncat);
136 __extern_always_inline wchar_t *
137 -__NTH (wcsncat (wchar_t *__dest, __const wchar_t *__src, size_t __n))
138 +__NTH (wcsncat (wchar_t *__restrict __dest, __const wchar_t *__restrict __src,
141 if (__bos (__dest) != (size_t) -1)
142 return __wcsncat_chk (__dest, __src, __n,
143 @@ -428,14 +430,16 @@ fgetws_unlocked (wchar_t *__restrict __s
147 -extern size_t __wcrtomb_chk (char *__s, wchar_t __wchar, mbstate_t *__p,
148 - size_t __buflen) __THROW __wur;
149 +extern size_t __wcrtomb_chk (char *__restrict __s, wchar_t __wchar,
150 + mbstate_t *__restrict __p,
151 + size_t __buflen) __THROW __wur;
152 extern size_t __REDIRECT_NTH (__wcrtomb_alias,
153 (char *__restrict __s, wchar_t __wchar,
154 mbstate_t *__restrict __ps), wcrtomb) __wur;
156 __extern_always_inline __wur size_t
157 -__NTH (wcrtomb (char *__s, wchar_t __wchar, mbstate_t *__ps))
158 +__NTH (wcrtomb (char *__restrict __s, wchar_t __wchar,
159 + mbstate_t *__restrict __ps))
161 /* We would have to include <limits.h> to get a definition of MB_LEN_MAX.
162 But this would only disturb the namespace. So we define our own
163 Index: glibc-2.12-2-gc4ccff1/wcsmbs/wchar.h
164 ===================================================================
165 --- glibc-2.12-2-gc4ccff1.orig/wcsmbs/wchar.h
166 +++ glibc-2.12-2-gc4ccff1/wcsmbs/wchar.h
167 @@ -555,17 +555,17 @@ extern float wcstof_l (__const wchar_t *
168 extern long double wcstold_l (__const wchar_t *__restrict __nptr,
169 wchar_t **__restrict __endptr,
170 __locale_t __loc) __THROW;
174 -#ifdef __USE_XOPEN2K8
175 /* Copy SRC to DEST, returning the address of the terminating L'\0' in
177 -extern wchar_t *wcpcpy (wchar_t *__dest, __const wchar_t *__src) __THROW;
178 +extern wchar_t *wcpcpy (wchar_t *__restrict __dest,
179 + __const wchar_t *__restrict __src) __THROW;
181 /* Copy no more than N characters of SRC to DEST, returning the address of
182 the last character written into DEST. */
183 -extern wchar_t *wcpncpy (wchar_t *__dest, __const wchar_t *__src, size_t __n)
184 +extern wchar_t *wcpncpy (wchar_t *__restrict __dest,
185 + __const wchar_t *__restrict __src, size_t __n)