~mdw
/
catacomb
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
key/key-io.c: Add low-level `key_mergeline' and `key_extractline' functions.
[catacomb]
/
progs
/
cookie.c
diff --git
a/progs/cookie.c
b/progs/cookie.c
index
6239eb0
..
c6912ff
100644
(file)
--- a/
progs/cookie.c
+++ b/
progs/cookie.c
@@
-80,7
+80,7
@@
typedef struct cookie {
octet *_p = (octet *)(p); \
const cookie *_c = (c); \
STORE32(_p + 0, _c->k); \
octet *_p = (octet *)(p); \
const cookie *_c = (c); \
STORE32(_p + 0, _c->k); \
- STORE32(_p + 4, ((_c->exp & ~
MASK32) >> 16) >> 16);
\
+ STORE32(_p + 4, ((_c->exp & ~
(unsigned long)MASK32) >> 16) >> 16);
\
STORE32(_p + 8, _c->exp); \
} while (0)
STORE32(_p + 8, _c->exp); \
} while (0)
@@
-97,7
+97,8
@@
typedef struct cookie {
cookie *_c = (c); \
const octet *_p = (const octet *)(p); \
_c->k = LOAD32(_p + 0); \
cookie *_c = (c); \
const octet *_p = (const octet *)(p); \
_c->k = LOAD32(_p + 0); \
- _c->exp = ((time_t)(((LOAD32(_p + 4) << 16) << 16) & ~MASK32) | \
+ _c->exp = ((time_t)(((LOAD32(_p + 4) << 16) << 16) & \
+ ~(unsigned long)MASK32) | \
(time_t)LOAD32(_p + 8)); \
} while (0)
(time_t)LOAD32(_p + 8)); \
} while (0)