summaryrefslogtreecommitdiff
path: root/lib/libc/stdlib/merge.c
diff options
context:
space:
mode:
authorRobert Nordier <rnordier@FreeBSD.org>1998-11-04 09:22:07 +0000
committerRobert Nordier <rnordier@FreeBSD.org>1998-11-04 09:22:07 +0000
commitdf5a1b840e6eea92f18612ab129585f7bb53b8bd (patch)
tree174e5825c307b4f22ad17cb52dffdcfb94ce8e8e /lib/libc/stdlib/merge.c
parent16c775657cb185da5100c874ce7d2da81829efb5 (diff)
Notes
Diffstat (limited to 'lib/libc/stdlib/merge.c')
-rw-r--r--lib/libc/stdlib/merge.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/libc/stdlib/merge.c b/lib/libc/stdlib/merge.c
index e188dfe1a1a32..083a9642502ee 100644
--- a/lib/libc/stdlib/merge.c
+++ b/lib/libc/stdlib/merge.c
@@ -150,7 +150,7 @@ mergesort(base, nmemb, size, cmp)
sense = 0;
}
if (!big) { /* here i = 0 */
-LINEAR: while ((b += size) < t && cmp(q, b) >sense)
+ while ((b += size) < t && cmp(q, b) >sense)
if (++i == 6) {
big = 1;
goto EXPONENTIAL;
@@ -171,7 +171,7 @@ EXPONENTIAL: for (i = size; ; i <<= 1)
goto FASTCASE;
} else
b = p;
-SLOWCASE: while (t > b+size) {
+ while (t > b+size) {
i = (((t - b) / size) >> 1) * size;
if ((*cmp)(q, p = b + i) <= sense)
t = p;