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.

diff --git a/ChangeLog b/ChangeLog
index b072b80..54a0ab3 100644 (file)
--- 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 4c31de7..d011ce6 100644 (file)
--- 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.
 \f
+Version 2.23
+
+* The following bugs are resolved with this release:
+  18265
+\f
 Version 2.22
 
 * The following bugs are resolved with this release:

diff --git a/wcsmbs/wchar.h b/wcsmbs/wchar.h
index 0d68cda..10c1b5f 100644 (file)
--- 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