summaryrefslogtreecommitdiffstats
path: root/usr.bin
diff options
context:
space:
mode:
authorache <ache@FreeBSD.org>2003-08-03 04:18:07 +0000
committerache <ache@FreeBSD.org>2003-08-03 04:18:07 +0000
commit80172fba767fa66b35f9804c3bf6a64fd7d8ed6e (patch)
tree12326ef35025884ea9a6cd9b6e9db464c15b406f /usr.bin
parentb97366a2365a23c5d581d22f32efd5dfbc55ec69 (diff)
downloadFreeBSD-src-80172fba767fa66b35f9804c3bf6a64fd7d8ed6e.zip
FreeBSD-src-80172fba767fa66b35f9804c3bf6a64fd7d8ed6e.tar.gz
Remove charcoll() stabilization added in 1.16, it gains nothing but conflicts
with ranges.
Diffstat (limited to 'usr.bin')
-rw-r--r--usr.bin/tr/tr.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/usr.bin/tr/tr.c b/usr.bin/tr/tr.c
index d6c9698..bb76269 100644
--- a/usr.bin/tr/tr.c
+++ b/usr.bin/tr/tr.c
@@ -332,14 +332,10 @@ int
charcoll(const void *a, const void *b)
{
static char sa[2], sb[2];
- int r;
sa[0] = *(const int *)a;
sb[0] = *(const int *)b;
- r = strcoll(sa, sb);
- if (r == 0)
- r = *(const int *)a - *(const int *)b;
- return (r);
+ return (strcoll(sa, sb));
}
static void
OpenPOWER on IntegriCloud