diff options
| author | ache <ache@FreeBSD.org> | 2003-08-03 04:40:40 +0000 |
|---|---|---|
| committer | ache <ache@FreeBSD.org> | 2003-08-03 04:40:40 +0000 |
| commit | 1dac9aa79dd064cfc065c3667a3b72f0cebbc2ce (patch) | |
| tree | 0a830f0ca9761d39c86730f59a529df4d7f565a3 /lib/libc/locale | |
| parent | 9b6751c3cce721fd07356de01ef4cf23f9f6f2b0 (diff) | |
| download | FreeBSD-src-1dac9aa79dd064cfc065c3667a3b72f0cebbc2ce.zip FreeBSD-src-1dac9aa79dd064cfc065c3667a3b72f0cebbc2ce.tar.gz | |
Remove __collate_range_cmp() stabilization, it conflicts with ranges
Diffstat (limited to 'lib/libc/locale')
| -rw-r--r-- | lib/libc/locale/collcmp.c | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/lib/libc/locale/collcmp.c b/lib/libc/locale/collcmp.c index 657b325..b3e6ae0 100644 --- a/lib/libc/locale/collcmp.c +++ b/lib/libc/locale/collcmp.c @@ -41,20 +41,14 @@ __FBSDID("$FreeBSD$"); * "[a-z]"-type ranges with national characters. */ -int __collate_range_cmp (c1, c2) +int __collate_range_cmp(c1, c2) int c1, c2; { static char s1[2], s2[2]; - int ret; #ifndef ASCII_COMPATIBLE_COLLATE int as1, as2, al1, al2; #endif - c1 &= UCHAR_MAX; - c2 &= UCHAR_MAX; - if (c1 == c2) - return (0); - #ifndef ASCII_COMPATIBLE_COLLATE as1 = isascii(c1); as2 = isascii(c2); @@ -79,7 +73,5 @@ int __collate_range_cmp (c1, c2) #endif s1[0] = c1; s2[0] = c2; - if ((ret = strcoll(s1, s2)) != 0) - return (ret); - return (c1 - c2); + return (strcoll(s1, s2)); } |
