diff options
author | rsc <devnull@localhost> | 2006-04-01 19:24:03 +0000 |
---|---|---|
committer | rsc <devnull@localhost> | 2006-04-01 19:24:03 +0000 |
commit | cbeb0b26e4c7caa8d1b47de791a7418dc20a4567 (patch) | |
tree | e0f7e445de1aa22a42ef873dc4b1118a8105ae93 /src/libventi | |
parent | 226d80b8213821af0cbf092d1507c52b504fd368 (diff) | |
download | plan9port-cbeb0b26e4c7caa8d1b47de791a7418dc20a4567.tar.gz plan9port-cbeb0b26e4c7caa8d1b47de791a7418dc20a4567.tar.bz2 plan9port-cbeb0b26e4c7caa8d1b47de791a7418dc20a4567.zip |
Use gcc -ansi -pedantic in 9c. Fix many non-C89-isms.
Diffstat (limited to 'src/libventi')
-rw-r--r-- | src/libventi/cache.c | 8 | ||||
-rw-r--r-- | src/libventi/file.c | 2 | ||||
-rw-r--r-- | src/libventi/log.c | 2 | ||||
-rw-r--r-- | src/libventi/mem.c | 2 | ||||
-rw-r--r-- | src/libventi/packet.c | 10 | ||||
-rw-r--r-- | src/libventi/server.c | 4 |
6 files changed, 14 insertions, 14 deletions
diff --git a/src/libventi/cache.c b/src/libventi/cache.c index be0d6ac4..76436f18 100644 --- a/src/libventi/cache.c +++ b/src/libventi/cache.c @@ -22,10 +22,10 @@ enum { BioReading, BioWriting, BioEmpty, - BioVentiError, + BioVentiError }; enum { - BadHeap = ~0, + BadHeap = ~0 }; struct VtCache { @@ -159,7 +159,7 @@ cachecheck(VtCache *c) } if(c->nheap + refed != c->nblock){ fprint(2, "cachecheck: nheap %d refed %d nblocks %d\n", c->nheap, refed, c->nblock); -//vtcachedump(c); +/*vtcachedump(c); */ } assert(c->nheap + refed == c->nblock); refed = 0; @@ -488,7 +488,7 @@ if(0)fprint(2, "vtblockput: %d: %x %d %d\n", getpid(), b->addr, c->nheap, b->ios assert(b->ref == 0); switch(b->iostate){ case BioVenti: -//if(b->addr != NilBlock) print("blockput %d\n", b->addr); +/*if(b->addr != NilBlock) print("blockput %d\n", b->addr); */ b->used = c->now++; case BioVentiError: heapins(b); diff --git a/src/libventi/file.c b/src/libventi/file.c index 8c9ecc6e..174561ec 100644 --- a/src/libventi/file.c +++ b/src/libventi/file.c @@ -517,7 +517,7 @@ blockwalk(VtBlock *p, int index, VtCache *c, int mode, VtEntry *e) score = p->data+index*VtScoreSize; break; } -//print("walk from %V/%d ty %d to %V ty %d\n", p->score, index, p->type, score, type); +/*print("walk from %V/%d ty %d to %V ty %d\n", p->score, index, p->type, score, type); */ if(mode == VtOWRITE && vtglobaltolocal(score) == NilBlock){ b = vtcacheallocblock(c, type); diff --git a/src/libventi/log.c b/src/libventi/log.c index 02f3aa39..7d0accde 100644 --- a/src/libventi/log.c +++ b/src/libventi/log.c @@ -10,7 +10,7 @@ static char Eremoved[] = "[removed]"; enum { /* defaults */ LogChunkSize = 8192, - LogSize = 65536, + LogSize = 65536 }; static struct { diff --git a/src/libventi/mem.c b/src/libventi/mem.c index cf86fe13..1346126f 100644 --- a/src/libventi/mem.c +++ b/src/libventi/mem.c @@ -4,7 +4,7 @@ enum { IdealAlignment = 32, - ChunkSize = 128*1024, + ChunkSize = 128*1024 }; diff --git a/src/libventi/packet.c b/src/libventi/packet.c index d3198939..aa5b2a0e 100644 --- a/src/libventi/packet.c +++ b/src/libventi/packet.c @@ -9,14 +9,14 @@ typedef struct Frag Frag; enum { BigMemSize = MaxFragSize, SmallMemSize = BigMemSize/8, - NLocalFrag = 2, + NLocalFrag = 2 }; /* position to carve out of a Mem */ enum { PFront, PMiddle, - PEnd, + PEnd }; struct Mem @@ -33,7 +33,7 @@ struct Mem enum { FragLocalFree, FragLocalAlloc, - FragGlobal, + FragGlobal }; struct Frag @@ -126,7 +126,7 @@ packetalloc(void) p->next = nil; p->pc = getcallerpc((char*)&p+8); /* might not work, but fine */ -//if(0)fprint(2, "packetalloc %p from %08lux %08lux %08lux\n", p, *((uint*)&p+2), *((uint*)&p+3), *((uint*)&p+4)); +/*if(0)fprint(2, "packetalloc %p from %08lux %08lux %08lux\n", p, *((uint*)&p+2), *((uint*)&p+3), *((uint*)&p+4)); */ NOTFREE(p); return p; @@ -137,7 +137,7 @@ packetfree(Packet *p) { Frag *f, *ff; -//if(1)fprint(2, "packetfree %p from %08lux\n", p, getcallerpc(&p)); +/*if(1)fprint(2, "packetfree %p from %08lux\n", p, getcallerpc(&p)); */ if(p == nil) return; diff --git a/src/libventi/server.c b/src/libventi/server.c index 1fb3c14b..d82be698 100644 --- a/src/libventi/server.c +++ b/src/libventi/server.c @@ -6,7 +6,7 @@ enum { - STACK = 8192, + STACK = 8192 }; typedef struct VtSconn VtSconn; @@ -93,7 +93,7 @@ listenproc(void *v) proccreate(connproc, sc, STACK); } - // hangup + /* hangup */ } static void |