commit - 5a69e405fcae96b476cdd7a0767e87b94c0b7266
commit + b29ebaab99090fa06e27377fe9e1f356ac533604
blob - f37a7101f09847b5020d417c58df9db69ee75c86
blob + 23f89461ee488c08dec00fce2136fb35e4e3e33c
--- src/cmd/fossil/cache.c
+++ src/cmd/fossil/cache.c
}
static int
-baddrCmp(void *a0, void *a1)
+baddrCmp(const void *a0, const void *a1)
{
BAddr *b0, *b1;
- b0 = a0;
- b1 = a1;
+ b0 = (BAddr*)a0;
+ b1 = (BAddr*)a1;
if(b0->part < b1->part)
return -1;
blob - 53a1bf203c2bf947e3168dd0ee988d12e07c129c
blob + 6aa90fc776f264e1aff7d3a3111075d241127b85
--- src/cmd/fossil/check.c
+++ src/cmd/fossil/check.c
};
static int
-offsetCmp(void *s0, void *s1)
+offsetCmp(const void *s0, const void *s1)
{
MetaChunk *mc0, *mc1;
- mc0 = s0;
- mc1 = s1;
+ mc0 = (MetaChunk*)s0;
+ mc1 = (MetaChunk*)s1;
if(mc0->offset < mc1->offset)
return -1;
if(mc0->offset > mc1->offset)
blob - f68bfb5682af698afa482ef0fec9d32dfbf092ee
blob + ac466bdd5bb2145527532bff4c49bfdc8b9d7e89
--- src/cmd/fossil/flfmt9660.c
+++ src/cmd/fossil/flfmt9660.c
ascii();
v = (Voldesc*)root;
- if(memcmp(v->magic, "\x01CD001\x01\x00", 8) != 0)
+ if(memcmp(v->magic, "\001CD001\001\000", 8) != 0)
sysfatal("%s not a cd image", file9660);
startoff = iso9660start((Cdir*)v->rootdir)*Blocksize;
if(readn(fd, sect2, Blocksize) != Blocksize)
sysfatal("cannot read first data sector on cd via fossil");
if(memcmp(sect, sect2, Blocksize) != 0)
- sysfatal("iso9660 offset is a lie %08lux %08lux", *(long*)sect, *(long*)sect2);
+ sysfatal("iso9660 offset is a lie");
}
void
blob - 1dc33470ec499e7033e40b67c321b024d57fec51
blob + b27f90b86f2a16992d73a7622d64aeef203d7cb4
--- src/cmd/fossil/pack.c
+++ src/cmd/fossil/pack.c
#define U8PUT(p,v) (p)[0]=(v)
#define U16PUT(p,v) (p)[0]=(v)>>8;(p)[1]=(v)
-#define U32PUT(p,v) (p)[0]=(v)>>24;(p)[1]=(v)>>16;(p)[2]=(v)>>8;(p)[3]=(v)
+#define U32PUT(p,v) (p)[0]=((v)>>24)&0xFF;(p)[1]=((v)>>16)&0xFF;(p)[2]=((v)>>8)&0xFF;(p)[3]=(v)&0xFF
#define U48PUT(p,v,t32) t32=(v)>>32;U16PUT(p,t32);t32=(v);U32PUT((p)+2,t32)
#define U64PUT(p,v,t32) t32=(v)>>32;U32PUT(p,t32);t32=(v);U32PUT((p)+4,t32)
blob - 85f0c7f2ade56bc5d7643b231af1ab65ab463a91
blob + 92c685abce2e19681bae19b886c404b7f230c628
--- src/cmd/fossil/vac.c
+++ src/cmd/fossil/vac.c
#define U8PUT(p,v) (p)[0]=(v)
#define U16PUT(p,v) (p)[0]=(v)>>8;(p)[1]=(v)
-#define U32PUT(p,v) (p)[0]=(v)>>24;(p)[1]=(v)>>16;(p)[2]=(v)>>8;(p)[3]=(v)
+#define U32PUT(p,v) (p)[0]=((v)>>24)&0xFF;(p)[1]=((v)>>16)&0xFF;(p)[2]=((v)>>8)&0xFF;(p)[3]=(v)&0xFF
#define U48PUT(p,v,t32) t32=(v)>>32;U16PUT(p,t32);t32=(v);U32PUT((p)+2,t32)
#define U64PUT(p,v,t32) t32=(v)>>32;U32PUT(p,t32);t32=(v);U32PUT((p)+4,t32)
}
static int
-offsetCmp(void *s0, void *s1)
+offsetCmp(const void *s0, const void *s1)
{
MetaChunk *mc0, *mc1;
- mc0 = s0;
- mc1 = s1;
+ mc0 = (MetaChunk*)s0;
+ mc1 = (MetaChunk*)s1;
if(mc0->offset < mc1->offset)
return -1;
if(mc0->offset > mc1->offset)