Commit 5f0580cc authored by Andy Polyakov's avatar Andy Polyakov
Browse files

Harmonize pointer printing and size_t-fy casts. 



Reviewed-by: default avatarRichard Levitte <levitte@openssl.org>
parent 21ff9ac8

crypto/bio/b_print.c

+1 −1
Original line number Diff line number Diff line
@@ -370,7 +370,7 @@ _dopr(char **sbuffer, 
                       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;

crypto/mem_dbg.c

+4 −4
Original line number Diff line number Diff line
@@ -321,9 +321,9 @@ static IMPLEMENT_LHASH_COMP_FN(mem, MEM) 


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 @@ static void print_leak_doall_arg(const MEM *m, MEM_LEAK *l) 
        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);

crypto/thr_id.c

+1 −1
Original line number Diff line number Diff line
@@ -146,7 +146,7 @@ void CRYPTO_THREADID_set_pointer(CRYPTO_THREADID *id, void *ptr) 
        /*

         * 'ptr' can be embedded in 'val' without loss of uniqueness

         */

        id->val = (unsigned long)id->ptr;

        id->val = (size_t)id->ptr;

        return;

    }

    /*