summaryrefslogtreecommitdiff
path: root/src/lib/libc/stdlib/merge.c
diff options
context:
space:
mode:
authortholo <>1996-09-15 09:31:53 +0000
committertholo <>1996-09-15 09:31:53 +0000
commit27b62657a94b21845fcea14320c285cb5b1a2800 (patch)
tree947900ef381c1a838cf05f934ed5349615aac605 /src/lib/libc/stdlib/merge.c
parent5db356f3a7b6b461177c41660da527087e8d4399 (diff)
downloadopenbsd-27b62657a94b21845fcea14320c285cb5b1a2800.tar.gz
openbsd-27b62657a94b21845fcea14320c285cb5b1a2800.tar.bz2
openbsd-27b62657a94b21845fcea14320c285cb5b1a2800.zip
Remove dead code
Remove unused variables Silence some warnings lint(1) is your friend
Diffstat (limited to 'src/lib/libc/stdlib/merge.c')
-rw-r--r--src/lib/libc/stdlib/merge.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/libc/stdlib/merge.c b/src/lib/libc/stdlib/merge.c
index 8c73cd238b..0a1015ad9d 100644
--- a/src/lib/libc/stdlib/merge.c
+++ b/src/lib/libc/stdlib/merge.c
@@ -35,7 +35,7 @@
35 */ 35 */
36 36
37#if defined(LIBC_SCCS) && !defined(lint) 37#if defined(LIBC_SCCS) && !defined(lint)
38static char *rcsid = "$OpenBSD: merge.c,v 1.2 1996/08/19 08:33:38 tholo Exp $"; 38static char *rcsid = "$OpenBSD: merge.c,v 1.3 1996/09/15 09:31:50 tholo Exp $";
39#endif /* LIBC_SCCS and not lint */ 39#endif /* LIBC_SCCS and not lint */
40 40
41/* 41/*
@@ -147,7 +147,7 @@ mergesort(base, nmemb, size, cmp)
147 sense = 0; 147 sense = 0;
148 } 148 }
149 if (!big) { /* here i = 0 */ 149 if (!big) { /* here i = 0 */
150LINEAR: while ((b += size) < t && cmp(q, b) >sense) 150 while ((b += size) < t && cmp(q, b) >sense)
151 if (++i == 6) { 151 if (++i == 6) {
152 big = 1; 152 big = 1;
153 goto EXPONENTIAL; 153 goto EXPONENTIAL;
@@ -168,7 +168,7 @@ EXPONENTIAL: for (i = size; ; i <<= 1)
168 goto FASTCASE; 168 goto FASTCASE;
169 } else 169 } else
170 b = p; 170 b = p;
171SLOWCASE: while (t > b+size) { 171 while (t > b+size) {
172 i = (((t - b) / size) >> 1) * size; 172 i = (((t - b) / size) >> 1) * size;
173 if ((*cmp)(q, p = b + i) <= sense) 173 if ((*cmp)(q, p = b + i) <= sense)
174 t = p; 174 t = p;