aboutsummaryrefslogtreecommitdiff
path: root/src/cmd/venti/srv/conv.c
diff options
context:
space:
mode:
authorPetter Rodhelind <petter.rodhelind@gmail.com>2020-01-14 11:41:08 +0100
committerPetter Rodhelind <petter.rodhelind@gmail.com>2020-01-14 11:41:08 +0100
commit02d7aa8915f9c3a3288dab01f321eb94ba219e3b (patch)
treef053238978479e408a2b83571443e132f30586ab /src/cmd/venti/srv/conv.c
parentc0c9d8f883dfd3a7f5a74499d91bb95884b15873 (diff)
parent3d1382b98a502d0c34d5ba2c462396acc515016e (diff)
downloadplan9port-02d7aa8915f9c3a3288dab01f321eb94ba219e3b.tar.gz
plan9port-02d7aa8915f9c3a3288dab01f321eb94ba219e3b.tar.bz2
plan9port-02d7aa8915f9c3a3288dab01f321eb94ba219e3b.zip
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'src/cmd/venti/srv/conv.c')
-rw-r--r--src/cmd/venti/srv/conv.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/cmd/venti/srv/conv.c b/src/cmd/venti/srv/conv.c
index e6a6cbfe..90aefbec 100644
--- a/src/cmd/venti/srv/conv.c
+++ b/src/cmd/venti/srv/conv.c
@@ -162,7 +162,7 @@ unpackarena(Arena *arena, u8int *buf)
* all the existing version 4 arenas too.
*
* To maintain backwards compatibility with existing venti
- * installations using the older format, we define that if
+ * installations using the older format, we define that if
* memstats == diskstats, then the extension fields are not
* included (see packarena below). That is, only partially
* indexed arenas have these fields. Fully indexed arenas
@@ -181,7 +181,7 @@ unpackarena(Arena *arena, u8int *buf)
p += U64Size;
arena->memstats.sealed = U8GET(p);
p += U8Size;
-
+
/*
* 2008/4/2
* Packarena (below) used to have a bug in which it would
@@ -264,7 +264,7 @@ _packarena(Arena *arena, u8int *buf, int forceext)
p += U64Size;
U8PUT(p, arena->diskstats.sealed);
p += U8Size;
-
+
/*
* Extension fields; see above.
*/
@@ -281,7 +281,7 @@ _packarena(Arena *arena, u8int *buf, int forceext)
p += U32Size;
U32PUT(p, arena->memstats.cclumps);
p += U32Size;
- U64PUT(p, arena->memstats.used, t32);
+ U64PUT(p, arena->memstats.used, t32);
p += U64Size;
U64PUT(p, arena->memstats.uncsize, t32);
p += U64Size;
@@ -669,7 +669,7 @@ unpackibucket(IBucket *b, u8int *buf, u32int magic)
b->data = buf + IBucketSize;
if(magic && magic != U32GET(buf+U16Size))
b->n = 0;
-}
+}
void
packibucket(IBucket *b, u8int *buf, u32int magic)
@@ -705,7 +705,7 @@ unpackbloomhead(Bloom *b, u8int *buf)
return -1;
}
p += U32Size;
-
+
m = U32GET(p);
if(m != BloomVersion){
seterr(ECorrupt, "bloom filter has wrong version %ud expected %ud", (uint)m, (uint)BloomVersion);