diff options
| author | Daniel Marjamäki <Daniel.Marjamaki@evidente.se> | 2015-05-22 08:00:26 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2015-08-05 04:43:42 -0400 |
| commit | aeb47bbc06cae80bbcc69452eb65118b5fe656b9 (patch) | |
| tree | 73bcc01ce1fe45a2a61692b7a95d1b38f5ba1e7d | |
| parent | 496405af79252a2eb7a5ebdc3e29ba452869d047 (diff) | |
| download | glibc-aeb47bbc06cae80bbcc69452eb65118b5fe656b9.tar.gz glibc-aeb47bbc06cae80bbcc69452eb65118b5fe656b9.tar.xz glibc-aeb47bbc06cae80bbcc69452eb65118b5fe656b9.zip | |
Updated __nonnull annotations for wcscat, wcsncat, wcscmp and wcsncmp [BZ #18265]
This patch adds __nonnull annotations for wcscat, wcsncat, wcscmp and wcsncmp. These added annotations match the annoations for strcat, strncat, strcmp, strncmp in glibc.
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | NEWS | 5 | ||||
| -rw-r--r-- | wcsmbs/wchar.h | 9 |
3 files changed, 18 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog index b072b80e9f..54a0ab387b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2015-08-05 Daniel Marjamäki <daniel.marjamaki@evidente.se> + + [BZ #18265] + * wcsmbs/wchar.h (wcscat): Add __nonnull attribute. + (wcsncat): Likewise. + (wcscmp): Likewise. + (wcsncmp): Likewise. + 2015-08-05 Mike Frysinger <vapier@gentoo.org> * test-skeleton.c (usage): New function. diff --git a/NEWS b/NEWS index 4c31de7b2d..d011ce6030 100644 --- a/NEWS +++ b/NEWS @@ -5,6 +5,11 @@ See the end for copying conditions. Please send GNU C library bug reports via <http://sourceware.org/bugzilla/> using `glibc' in the "product" field. +Version 2.23 + +* The following bugs are resolved with this release: + 18265 + Version 2.22 * The following bugs are resolved with this release: diff --git a/wcsmbs/wchar.h b/wcsmbs/wchar.h index 0d68cdaf17..10c1b5feab 100644 --- a/wcsmbs/wchar.h +++ b/wcsmbs/wchar.h @@ -155,18 +155,19 @@ extern wchar_t *wcsncpy (wchar_t *__restrict __dest, /* Append SRC onto DEST. */ extern wchar_t *wcscat (wchar_t *__restrict __dest, - const wchar_t *__restrict __src) __THROW; + const wchar_t *__restrict __src) + __THROW __nonnull ((1, 2)); /* Append no more than N wide-characters of SRC onto DEST. */ extern wchar_t *wcsncat (wchar_t *__restrict __dest, const wchar_t *__restrict __src, size_t __n) - __THROW; + __THROW __nonnull ((1, 2)); /* Compare S1 and S2. */ extern int wcscmp (const wchar_t *__s1, const wchar_t *__s2) - __THROW __attribute_pure__; + __THROW __attribute_pure__ __nonnull ((1, 2)); /* Compare N wide-characters of S1 and S2. */ extern int wcsncmp (const wchar_t *__s1, const wchar_t *__s2, size_t __n) - __THROW __attribute_pure__; + __THROW __attribute_pure__ __nonnull ((1, 2)); __END_NAMESPACE_STD #ifdef __USE_XOPEN2K8 |