Harmonize pointer printing and size_t-fy casts. Reviewed-by: Richard Levitte <levitte@openssl.org>
diff --git a/crypto/bio/b_print.c b/crypto/bio/b_print.c index 06cadc8..f49ebee4 100644 --- a/crypto/bio/b_print.c +++ b/crypto/bio/b_print.c
@@ -370,7 +370,7 @@ flags, min, max); break; case 'p': - value = (long)va_arg(args, void *); + value = (size_t)va_arg(args, void *); fmtint(sbuffer, buffer, &currlen, maxlen, value, 16, min, max, flags | DP_F_NUM); break;
diff --git a/crypto/mem_dbg.c b/crypto/mem_dbg.c index 10cc893..2cd1169 100644 --- a/crypto/mem_dbg.c +++ b/crypto/mem_dbg.c
@@ -321,9 +321,9 @@ static unsigned long mem_hash(const MEM *a) { - unsigned long ret; + size_t ret; - ret = (unsigned long)a->addr; + ret = (size_t)a->addr; ret = ret * 17851 + (ret >> 14) * 7 + (ret >> 4) * 251; return (ret); @@ -661,8 +661,8 @@ bufp += strlen(bufp); } - BIO_snprintf(bufp, BUF_REMAIN, "number=%d, address=%08lX\n", - m->num, (unsigned long)m->addr); + BIO_snprintf(bufp, BUF_REMAIN, "number=%d, address=%p\n", + m->num, m->addr); bufp += strlen(bufp); BIO_puts(l->bio, buf);
diff --git a/crypto/thr_id.c b/crypto/thr_id.c index c391fc4..51088e4 100644 --- a/crypto/thr_id.c +++ b/crypto/thr_id.c
@@ -146,7 +146,7 @@ /* * 'ptr' can be embedded in 'val' without loss of uniqueness */ - id->val = (unsigned long)id->ptr; + id->val = (size_t)id->ptr; return; } /*