mirror of
https://github.com/opnsense/src.git
synced 2026-06-11 01:30:30 -04:00
Remove __collate_range_cmp() stabilization, it conflicts with ranges
This commit is contained in:
parent
94bfac9e80
commit
17f67afe28
1 changed files with 2 additions and 10 deletions
|
|
@ -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));
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue