~mdw
/
catacomb
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
progs/..., symm/...: Fix 32-bit right-shift idiom.
[catacomb]
/
progs
/
dsig.c
diff --git
a/progs/dsig.c
b/progs/dsig.c
index
5e5a3cf
..
1377bca
100644
(file)
--- a/
progs/dsig.c
+++ b/
progs/dsig.c
@@
-233,7
+233,8
@@
static int bget(block *b, FILE *fp, unsigned bin)
octet buf[8];
if (fread(buf, sizeof(buf), 1, fp) < 1)
return (E_EOF);
octet buf[8];
if (fread(buf, sizeof(buf), 1, fp) < 1)
return (E_EOF);
- b->t = ((time_t)(((LOAD32(buf + 0) << 16) << 16) & ~MASK32) |
+ b->t = ((time_t)(((LOAD32(buf + 0) << 16) << 16) &
+ ~(unsigned long)MASK32) |
(time_t)LOAD32(buf + 4));
} else {
if (getstring(fp, &b->d, GSF_FILE))
(time_t)LOAD32(buf + 4));
} else {
if (getstring(fp, &b->d, GSF_FILE))
@@
-325,7
+326,8
@@
static void blob(block *b, dstr *d)
STORE32(d->buf + d->len, 0xffffffff);
STORE32(d->buf + d->len + 4, 0xffffffff);
} else {
STORE32(d->buf + d->len, 0xffffffff);
STORE32(d->buf + d->len + 4, 0xffffffff);
} else {
- STORE32(d->buf + d->len, ((b->t & ~MASK32) >> 16) >> 16);
+ STORE32(d->buf + d->len,
+ ((b->t & ~(unsigned long)MASK32) >> 16) >> 16);
STORE32(d->buf + d->len + 4, b->t);
}
d->len += 8;
STORE32(d->buf + d->len + 4, b->t);
}
d->len += 8;