diff options
| author | rsc <devnull@localhost> | 2007-04-21 19:40:55 +0000 |
|---|---|---|
| committer | rsc <devnull@localhost> | 2007-04-21 19:40:55 +0000 |
| commit | 27d28098203579f0735ba6400641e9be94eb12f8 (patch) | |
| tree | 9e0f390ced0de8c582ef3226c420daa18d16ac24 /src/cmd/venti/srv/sortientry.c | |
| parent | 33433b3fde56d9b3ac6de6ee2584416b82bc856f (diff) | |
| download | plan9port-27d28098203579f0735ba6400641e9be94eb12f8.tar.gz plan9port-27d28098203579f0735ba6400641e9be94eb12f8.tar.bz2 plan9port-27d28098203579f0735ba6400641e9be94eb12f8.zip | |
sync with mit plan 9 version
Diffstat (limited to 'src/cmd/venti/srv/sortientry.c')
| -rw-r--r-- | src/cmd/venti/srv/sortientry.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/cmd/venti/srv/sortientry.c b/src/cmd/venti/srv/sortientry.c index fc5e85e7..b8b8e876 100644 --- a/src/cmd/venti/srv/sortientry.c +++ b/src/cmd/venti/srv/sortientry.c @@ -250,10 +250,7 @@ sortiebucks(IEBucks *ib) ib->bucks[i].buf = nil; ib->off = (u64int)ib->chunks * ib->size; free(ib->xbuf); -if(0){ - fprint(2, "ib->max = %lld\n", ib->max); - fprint(2, "ib->chunks = %ud\n", ib->chunks); -} + ib->buf = MKN(u8int, ib->max + U32Size); if(ib->buf == nil){ seterr(EOk, "out of memory allocating final sorting buffer; try more buckets"); @@ -270,7 +267,6 @@ if(0){ tot += n; } return tot; - return 0; } /* @@ -352,7 +348,7 @@ readiebuck(IEBucks *ib, int b) if(m == 0) m = ib->usable; if(0) if(ib->bucks[b].total) - fprint(2, "\tbucket %d: %d entries\n", b, ib->bucks[b].total/IEntrySize); + fprint(2, "\tbucket %d: %lld entries\n", b, ib->bucks[b].total/IEntrySize); while(head != TWID32){ if(readpart(ib->part, (u64int)head * ib->size, &ib->buf[n], m+U32Size) < 0){ seterr(EOk, "can't read index sort bucket: %r"); |