提交 5f0580cc 编写于 作者: A Andy Polyakov

Harmonize pointer printing and size_t-fy casts.

Reviewed-by: NRichard Levitte <levitte@openssl.org>
上级 21ff9ac8
...@@ -370,7 +370,7 @@ _dopr(char **sbuffer, ...@@ -370,7 +370,7 @@ _dopr(char **sbuffer,
flags, min, max); flags, min, max);
break; break;
case 'p': case 'p':
value = (long)va_arg(args, void *); value = (size_t)va_arg(args, void *);
fmtint(sbuffer, buffer, &currlen, maxlen, fmtint(sbuffer, buffer, &currlen, maxlen,
value, 16, min, max, flags | DP_F_NUM); value, 16, min, max, flags | DP_F_NUM);
break; break;
......
...@@ -321,9 +321,9 @@ static IMPLEMENT_LHASH_COMP_FN(mem, MEM) ...@@ -321,9 +321,9 @@ static IMPLEMENT_LHASH_COMP_FN(mem, MEM)
static unsigned long mem_hash(const MEM *a) 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; ret = ret * 17851 + (ret >> 14) * 7 + (ret >> 4) * 251;
return (ret); return (ret);
...@@ -661,8 +661,8 @@ static void print_leak_doall_arg(const MEM *m, MEM_LEAK *l) ...@@ -661,8 +661,8 @@ static void print_leak_doall_arg(const MEM *m, MEM_LEAK *l)
bufp += strlen(bufp); bufp += strlen(bufp);
} }
BIO_snprintf(bufp, BUF_REMAIN, "number=%d, address=%08lX\n", BIO_snprintf(bufp, BUF_REMAIN, "number=%d, address=%p\n",
m->num, (unsigned long)m->addr); m->num, m->addr);
bufp += strlen(bufp); bufp += strlen(bufp);
BIO_puts(l->bio, buf); BIO_puts(l->bio, buf);
......
...@@ -146,7 +146,7 @@ void CRYPTO_THREADID_set_pointer(CRYPTO_THREADID *id, void *ptr) ...@@ -146,7 +146,7 @@ void CRYPTO_THREADID_set_pointer(CRYPTO_THREADID *id, void *ptr)
/* /*
* 'ptr' can be embedded in 'val' without loss of uniqueness * 'ptr' can be embedded in 'val' without loss of uniqueness
*/ */
id->val = (unsigned long)id->ptr; id->val = (size_t)id->ptr;
return; return;
} }
/* /*
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册