diff options
| author | ache <ache@FreeBSD.org> | 2003-08-03 04:28:10 +0000 |
|---|---|---|
| committer | ache <ache@FreeBSD.org> | 2003-08-03 04:28:10 +0000 |
| commit | df9eb04e4072f01abe16a42a09e201621c88bbec (patch) | |
| tree | 1f8523e17315bca5c422b4cad454240f65296bf3 /bin | |
| parent | 80172fba767fa66b35f9804c3bf6a64fd7d8ed6e (diff) | |
| download | FreeBSD-src-df9eb04e4072f01abe16a42a09e201621c88bbec.zip FreeBSD-src-df9eb04e4072f01abe16a42a09e201621c88bbec.tar.gz | |
Remove collate_range_cmp() stabilization, it conflicts with ranges
Diffstat (limited to 'bin')
| -rw-r--r-- | bin/sh/expand.c | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/bin/sh/expand.c b/bin/sh/expand.c index 4ff7427..261bc7e 100644 --- a/bin/sh/expand.c +++ b/bin/sh/expand.c @@ -116,20 +116,13 @@ STATIC char *cvtnum(int, char *); STATIC int collate_range_cmp(int, int); STATIC int -collate_range_cmp (int c1, int c2) +collate_range_cmp(int c1, int c2) { static char s1[2], s2[2]; - int ret; - c1 &= UCHAR_MAX; - c2 &= UCHAR_MAX; - if (c1 == c2) - return (0); s1[0] = c1; s2[0] = c2; - if ((ret = strcoll(s1, s2)) != 0) - return (ret); - return (c1 - c2); + return (strcoll(s1, s2)); } /* |
