From patchwork Wed Jun 10 12:53:22 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Daniel_Marjam=C3=A4ki?= X-Patchwork-Id: 7099 Received: (qmail 26098 invoked by alias); 10 Jun 2015 12:53:29 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Delivered-To: mailing list libc-alpha@sourceware.org Received: (qmail 26085 invoked by uid 89); 10 Jun 2015 12:53:28 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=1.8 required=5.0 tests=AWL, BAYES_50, KAM_LAZY_DOMAIN_SECURITY, T_RP_MATCHES_RCVD autolearn=no version=3.3.2 X-HELO: mail.evidente.se From: =?iso-8859-1?Q?Daniel_Marjam=E4ki?= To: "libc-alpha@sourceware.org" Subject: [PING 2][PATCH][BZ #18265] Updated __nonnull annotations for wcscat, wcsncat, wcscmp and wcsncmp Date: Wed, 10 Jun 2015 12:53:22 +0000 Message-ID: MIME-Version: 1.0 Hello! This patch adds __nonnull annotations for wcscat, wcsncat, wcscmp and wcsncmp. These added annotations match the annoations for strcat, strncat, strcmp, strncmp in glibc. For information, I have completed the "copyright assignment form for glibc". Best regards, Daniel Marjamäki .................................................................................................................. Daniel Marjamäki Senior Engineer Evidente ES East AB Warfvinges väg 34 SE-112 51 Stockholm Sweden Mobile: +46 (0)709 12 42 62 E-mail: Daniel.Marjamaki@evidente.se www.evidente.se diff --git a/ChangeLog b/ChangeLog index ba7a400..a2b6eb4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2015-05-22 Daniel Marjamäki + + [BZ #18265] + * wcsmbs/wchar.h (wcscat): Add __nonnull attribute. + (wcsncat): Likewise. + (wcscmp): Likewise. + (wcsncmp): Likewise. + 2015-05-21 Joseph Myers * sysdeps/ieee754/dbl-64/e_lgamma_r.c: Include . diff --git a/wcsmbs/wchar.h b/wcsmbs/wchar.h index 0d68cda..10c1b5f 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