From: Zack Weinberg Date: Wed, 16 Nov 2016 19:18:32 +0000 (-0500) Subject: Correct comments in string.h re strcoll_l, strxfrm_l. X-Git-Tag: glibc-2.25~299 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7773556dfb2bf62f7b6deda66fa3821a3bcdbf3e;p=thirdparty%2Fglibc.git Correct comments in string.h re strcoll_l, strxfrm_l. * string/string.h: Remove obsolete comment stating that strcoll_l and strxfrm_l have not yet been standardized. --- diff --git a/ChangeLog b/ChangeLog index b2e5b68cf8e..25e1da152ad 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2016-11-16 Zack Weinberg + + * string/string.h: Remove obsolete comment stating that + strcoll_l and strxfrm_l have not yet been standardized. + 2016-11-16 Adhemerval Zanella * hurd/hurd.h (__hurd_fail_noerrno): New function. diff --git a/string/string.h b/string/string.h index 57deaa4191a..b103e64912f 100644 --- a/string/string.h +++ b/string/string.h @@ -154,15 +154,13 @@ extern size_t strxfrm (char *__restrict __dest, __END_NAMESPACE_STD #ifdef __USE_XOPEN2K8 -/* The following functions are equivalent to the both above but they - take the locale they use for the collation as an extra argument. - This is not standardsized but something like will come. */ # include -/* Compare the collated forms of S1 and S2 using rules from L. */ +/* Compare the collated forms of S1 and S2, using sorting rules from L. */ extern int strcoll_l (const char *__s1, const char *__s2, __locale_t __l) __THROW __attribute_pure__ __nonnull ((1, 2, 3)); -/* Put a transformation of SRC into no more than N bytes of DEST. */ +/* Put a transformation of SRC into no more than N bytes of DEST, + using sorting rules from L. */ extern size_t strxfrm_l (char *__dest, const char *__src, size_t __n, __locale_t __l) __THROW __nonnull ((2, 4)); #endif