Attachment 171026 Details for Bug 179721 – Add __wcollate_range_cmp() and use it

[patch] Add __wcollate_range_cmp() and use it

pr-glob.diff (text/plain), 1.66 KB, created by Pedro F. Giffuni on 2016-06-04 20:01:02 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Pedro F. Giffuni

Created: 2016-06-04 20:01:02 UTC

Size: 1.66 KB

patch

obsolete

>Index: lib/libc/locale/collate.h
>===================================================================
>--- lib/libc/locale/collate.h	(revision 301343)
>+++ lib/libc/locale/collate.h	(working copy)
>@@ -128,7 +128,8 @@
> int	__collate_equiv_value(locale_t, const wchar_t *, size_t);
> void	_collate_lookup(struct xlocale_collate *,const wchar_t *, int *, int *,
> 	int, const int **);
>-int	__collate_range_cmp(struct xlocale_collate *, wchar_t, wchar_t);
>+int	__collate_range_cmp(struct xlocale_collate *, char, char);
>+int	__wcollate_range_cmp(struct xlocale_collate *, wchar_t, wchar_t);
> size_t	_collate_wxfrm(struct xlocale_collate *, const wchar_t *, wchar_t *,
> 	size_t);
> size_t	_collate_sxfrm(struct xlocale_collate *, const wchar_t *, char *,
>Index: lib/libc/locale/collcmp.c
>===================================================================
>--- lib/libc/locale/collcmp.c	(revision 301343)
>+++ lib/libc/locale/collcmp.c	(working copy)
>@@ -41,14 +41,26 @@
>  * Compare two characters using collate
>  */
> 
>-int __collate_range_cmp(struct xlocale_collate *table, wchar_t c1, wchar_t c2)
>+int __collate_range_cmp(struct xlocale_collate *table, char c1, char c2)
> {
>+	char 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 (strcoll_l(s1, s2, &l));
>+}
>+int __wcollate_range_cmp(struct xlocale_collate *table, wchar_t c1, wchar_t c2)
>+{
> 	wchar_t s1[2], s2[2];
> 
> 	s1[0] = c1;
>-	s1[1] = 0;
>+	s1[1] = L'\0';
> 	s2[0] = c2;
>-	s2[1] = 0;
>+	s2[1] = L'\0';
> 	struct _xlocale l = {{0}};
> 	l.components[XLC_COLLATE] = (struct xlocale_component *)table;
> 	return (wcscoll_l(s1, s2, &l));

Actions: View | Diff

Attachments on bug 179721: 134969 | 170924 | 170955 | 170956 | 171012 | 171025 | 171026 | 171028