From f4d08c0387cc5a87971563f751f848216e647ad8 Mon Sep 17 00:00:00 2001 From: keios Date: Tue, 3 Oct 2006 01:13:49 -0700 Subject: [PATCH] --- yaml --- r: 38002 b: refs/heads/master c: d3717bdf8f08a0e1039158c8bab2c24d20f492b6 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/lib/sort.c | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 9070648d1813..25cb87062a9b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ffc5089196446c08d9a005cf0dd7cab18d119606 +refs/heads/master: d3717bdf8f08a0e1039158c8bab2c24d20f492b6 diff --git a/trunk/lib/sort.c b/trunk/lib/sort.c index 5f3b51ffa1dc..488788b341cb 100644 --- a/trunk/lib/sort.c +++ b/trunk/lib/sort.c @@ -49,15 +49,15 @@ void sort(void *base, size_t num, size_t size, void (*swap)(void *, void *, int size)) { /* pre-scale counters for performance */ - int i = (num/2) * size, n = num * size, c, r; + int i = (num/2 - 1) * size, n = num * size, c, r; if (!swap) swap = (size == 4 ? u32_swap : generic_swap); /* heapify */ for ( ; i >= 0; i -= size) { - for (r = i; r * 2 < n; r = c) { - c = r * 2; + for (r = i; r * 2 + size < n; r = c) { + c = r * 2 + size; if (c < n - size && cmp(base + c, base + c + size) < 0) c += size; if (cmp(base + r, base + c) >= 0) @@ -69,8 +69,8 @@ void sort(void *base, size_t num, size_t size, /* sort */ for (i = n - size; i >= 0; i -= size) { swap(base, base + i, size); - for (r = 0; r * 2 < i; r = c) { - c = r * 2; + for (r = 0; r * 2 + size < i; r = c) { + c = r * 2 + size; if (c < i - size && cmp(base + c, base + c + size) < 0) c += size; if (cmp(base + r, base + c) >= 0)