diff options
author | David du Colombier <0intro@gmail.com> | 2011-06-02 09:33:56 -0400 |
---|---|---|
committer | Russ Cox <rsc@swtch.com> | 2011-06-02 09:33:56 -0400 |
commit | f5a8ea6fd8908c6f42670b8546239fdbc7fdbf03 (patch) | |
tree | f9e6abdcd5c651adf191f8a9b2dd9655404313a9 /src/cmd/venti/srv/conv.c | |
parent | 7fb06adf54aa6e47974673dcdeb328780927b8e6 (diff) | |
download | plan9port-f5a8ea6fd8908c6f42670b8546239fdbc7fdbf03.tar.gz plan9port-f5a8ea6fd8908c6f42670b8546239fdbc7fdbf03.tar.bz2 plan9port-f5a8ea6fd8908c6f42670b8546239fdbc7fdbf03.zip |
venti: import changes from plan 9
R=rsc
CC=plan9port.codebot
http://codereview.appspot.com/4523057
Diffstat (limited to 'src/cmd/venti/srv/conv.c')
-rw-r--r-- | src/cmd/venti/srv/conv.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/cmd/venti/srv/conv.c b/src/cmd/venti/srv/conv.c index 29b8c5f0..e6a6cbfe 100644 --- a/src/cmd/venti/srv/conv.c +++ b/src/cmd/venti/srv/conv.c @@ -15,6 +15,8 @@ #define U32PUT(p,v) (p)[0]=((v)>>24)&0xFF;(p)[1]=((v)>>16)&0xFF;(p)[2]=((v)>>8)&0xFF;(p)[3]=(v)&0xFF #define U64PUT(p,v,t32) t32=(v)>>32;U32PUT(p,t32);t32=(v);U32PUT((p)+4,t32) +int debugarena = -1; /* hack to improve error reporting */ + static struct { u32int m; char *s; @@ -112,7 +114,9 @@ unpackarena(Arena *arena, u8int *buf) m = U32GET(p); if(m != ArenaMagic){ - seterr(ECorrupt, "arena has wrong magic number: %s expected ArenaMagic (%#lux)", fmtmagic(fbuf, m), ArenaMagic); + seterr(ECorrupt, "arena %d has wrong magic number: %s " + "expected ArenaMagic (%#lux)", debugarena, + fmtmagic(fbuf, m), ArenaMagic); return -1; } p += U32Size; @@ -308,7 +312,9 @@ unpackarenahead(ArenaHead *head, u8int *buf) m = U32GET(p); if(m != ArenaHeadMagic){ - seterr(ECorrupt, "arena has wrong magic number: %s expected ArenaHeadMagic (%#lux)", fmtmagic(fbuf, m), ArenaHeadMagic); + seterr(ECorrupt, "arena %d head has wrong magic number: %s " + "expected ArenaHeadMagic (%#lux)", debugarena, + fmtmagic(fbuf, m), ArenaHeadMagic); return -1; } |