diff options
| author |   tholo <tholo@openbsd.org> | 1996-09-15 09:30:42 +0000 |
|---|---|---|
| committer | tholo <tholo@openbsd.org> | 1996-09-15 09:30:42 +0000 |
| commit | c8f91e0d750eb1dd5aa79a93a20a522c47067c28 (patch) | |
| tree | 151e2a572b80f59c243874a0738c218470cf1bc0 /lib/libc/stdlib/merge.c | |
| parent | print debugging flags in usage(); idea from freebsd (diff) | |
| download | wireguard-openbsd-c8f91e0d750eb1dd5aa79a93a20a522c47067c28.tar.xz wireguard-openbsd-c8f91e0d750eb1dd5aa79a93a20a522c47067c28.zip | |
Remove dead code
Remove unused variables
Silence some warnings
lint(1) is your friend
Diffstat (limited to 'lib/libc/stdlib/merge.c')
| -rw-r--r-- | lib/libc/stdlib/merge.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/libc/stdlib/merge.c b/lib/libc/stdlib/merge.c index 8c73cd238b4..0a1015ad9dd 100644 --- a/lib/libc/stdlib/merge.c +++ b/lib/libc/stdlib/merge.c @@ -35,7 +35,7 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -static char *rcsid = "$OpenBSD: merge.c,v 1.2 1996/08/19 08:33:38 tholo Exp $"; +static char *rcsid = "$OpenBSD: merge.c,v 1.3 1996/09/15 09:31:50 tholo Exp $"; #endif /* LIBC_SCCS and not lint */ /* @@ -147,7 +147,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; @@ -168,7 +168,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; |