diff options
Diffstat (limited to 'src/lib/libc/stdlib/merge.c')
| -rw-r--r-- | src/lib/libc/stdlib/merge.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/lib/libc/stdlib/merge.c b/src/lib/libc/stdlib/merge.c index 381fdc0830..0a1015ad9d 100644 --- a/src/lib/libc/stdlib/merge.c +++ b/src/lib/libc/stdlib/merge.c | |||
| @@ -35,8 +35,7 @@ | |||
| 35 | */ | 35 | */ |
| 36 | 36 | ||
| 37 | #if defined(LIBC_SCCS) && !defined(lint) | 37 | #if defined(LIBC_SCCS) && !defined(lint) |
| 38 | /*static char sccsid[] = "from: @(#)merge.c 8.2 (Berkeley) 2/14/94";*/ | 38 | static char *rcsid = "$OpenBSD: merge.c,v 1.3 1996/09/15 09:31:50 tholo Exp $"; |
| 39 | static char *rcsid = "$Id: merge.c,v 1.1.1.1 1995/10/18 08:42:18 deraadt Exp $"; | ||
| 40 | #endif /* LIBC_SCCS and not lint */ | 39 | #endif /* LIBC_SCCS and not lint */ |
| 41 | 40 | ||
| 42 | /* | 41 | /* |
| @@ -148,7 +147,7 @@ mergesort(base, nmemb, size, cmp) | |||
| 148 | sense = 0; | 147 | sense = 0; |
| 149 | } | 148 | } |
| 150 | if (!big) { /* here i = 0 */ | 149 | if (!big) { /* here i = 0 */ |
| 151 | LINEAR: while ((b += size) < t && cmp(q, b) >sense) | 150 | while ((b += size) < t && cmp(q, b) >sense) |
| 152 | if (++i == 6) { | 151 | if (++i == 6) { |
| 153 | big = 1; | 152 | big = 1; |
| 154 | goto EXPONENTIAL; | 153 | goto EXPONENTIAL; |
| @@ -169,7 +168,7 @@ EXPONENTIAL: for (i = size; ; i <<= 1) | |||
| 169 | goto FASTCASE; | 168 | goto FASTCASE; |
| 170 | } else | 169 | } else |
| 171 | b = p; | 170 | b = p; |
| 172 | SLOWCASE: while (t > b+size) { | 171 | while (t > b+size) { |
| 173 | i = (((t - b) / size) >> 1) * size; | 172 | i = (((t - b) / size) >> 1) * size; |
| 174 | if ((*cmp)(q, p = b + i) <= sense) | 173 | if ((*cmp)(q, p = b + i) <= sense) |
| 175 | t = p; | 174 | t = p; |
