Attachment #171012 for bug #179721

Lines 128-134 Link Here

(-)lib/libc/locale/collate.h (-1 / +1 lines)
128	int __collate_equiv_value(locale_t, const wchar_t *, size_t);	128	int __collate_equiv_value(locale_t, const wchar_t *, size_t);
129	void _collate_lookup(struct xlocale_collate ,const wchar_t , int , int ,	129	void _collate_lookup(struct xlocale_collate ,const wchar_t , int , int ,
130	int, const int **);	130	int, const int **);
131	int __collate_range_cmp(struct xlocale_collate *, wchar_t, wchar_t);	131	int __collate_range_cmp(struct xlocale_collate *, char_t, char_t);
132	size_t _collate_wxfrm(struct xlocale_collate , const wchar_t , wchar_t *,	132	size_t _collate_wxfrm(struct xlocale_collate , const wchar_t , wchar_t *,
133	size_t);	133	size_t);
134	size_t _collate_sxfrm(struct xlocale_collate , const wchar_t , char *,	134	size_t _collate_sxfrm(struct xlocale_collate , const wchar_t , char *,




 * Compare two characters using collate
 */

int __collate_range_cmp(struct xlocale_collate *table, char_t c1, char_t c2)
{
	char_t s1[2], s2[2];

	s1[0] = c1;
	s1[1] = '\0';
	s2[0] = c2;
	s2[1] = '\0';
	struct _xlocale l = {{0}};
	l.components[XLC_COLLATE] = (struct xlocale_component *)table;
	return (wcscoll_l(s1, s2, &l));

Return to bug 179721

Lines 41-54 Link Here

(-)lib/libc/locale/collcmp.c (-4 / +4 lines)
41	* Compare two characters using collate	41	* Compare two characters using collate
42	*/	42	*/
43		43
44	int __collate_range_cmp(struct xlocale_collate *table, wchar_t c1, wchar_t c2)	44	int __collate_range_cmp(struct xlocale_collate *table, char_t c1, char_t c2)
45	{	45	{
46	wchar_t s1[2], s2[2];	46	char_t s1[2], s2[2];
47		47
48	s1[0] = c1;	48	s1[0] = c1;
49	s1[1] = 0;	49	s1[1] = '\0';
50	s2[0] = c2;	50	s2[0] = c2;
51	s2[1] = 0;	51	s2[1] = '\0';
52	struct _xlocale l = {{0}};	52	struct _xlocale l = {{0}};
53	l.components[XLC_COLLATE] = (struct xlocale_component *)table;	53	l.components[XLC_COLLATE] = (struct xlocale_component *)table;
54	return (wcscoll_l(s1, s2, &l));	54	return (wcscoll_l(s1, s2, &l));