From: Simon Wilkinson Date: Wed, 21 Oct 2009 23:31:10 +0000 (+0100) Subject: Fix fall out from removal of memset casts X-Git-Tag: openafs-devel-1_5_66~16 X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=304f21cb7094e68224b22f8a91144f80207d7a3c;p=packages%2Fo%2Fopenafs.git Fix fall out from removal of memset casts In places where we're doing pointer arithmetic, we must cast to (char *), because pointer arithmetic on a void * isn't permitted by the C standard. Sadly gcc lets us get away with it 'for convenience'. Reinstate the necessary casts. Reviewed-on: http://gerrit.openafs.org/707 Tested-by: Jeffrey Altman Reviewed-by: Jeffrey Altman --- diff --git a/src/ptserver/ubik.c b/src/ptserver/ubik.c index 80c314729..4cec9f681 100644 --- a/src/ptserver/ubik.c +++ b/src/ptserver/ubik.c @@ -160,7 +160,7 @@ ubik_Read(struct ubik_trans *tt, void *buf, afs_int32 len) return (1); } if (status < len) - memset(buf + status, 0, len - status); + memset((char *)buf + status, 0, len - status); return (0); } diff --git a/src/rxkad/ticket5.c b/src/rxkad/ticket5.c index c8e95f49a..da90081f3 100644 --- a/src/rxkad/ticket5.c +++ b/src/rxkad/ticket5.c @@ -480,7 +480,7 @@ krb5_des_decrypt(struct ktc_encryptionKey *key, int etype, void *in, des_cbc_encrypt(in, out, insz, s, &ivec, 0); memcpy(cksum, (char *)out + CONFOUNDERSZ, cksumsz); - memset(out + CONFOUNDERSZ, 0, cksumsz); + memset((char *)out + CONFOUNDERSZ, 0, cksumsz); if (cksum_func) ret = (*cksum_func) (out, insz, cksum, cksumsz, key);