Commit 4591e5fb authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

Constify stack and lhash macros. 



RT#4471

Reviewed-by: default avatarTim Hudson <tjh@openssl.org>
parent 8bf78043

crypto/stack/stack.c

+7 −6
Original line number Diff line number Diff line
@@ -142,14 +142,14 @@ int OPENSSL_sk_insert(OPENSSL_STACK *st, void *data, int loc) 
    return (st->num);

}



void *OPENSSL_sk_delete_ptr(OPENSSL_STACK *st, void *p)

void *OPENSSL_sk_delete_ptr(OPENSSL_STACK *st, const void *p)

{

    int i;



    for (i = 0; i < st->num; i++)

        if (st->data[i] == p)

            return (OPENSSL_sk_delete(st, i));

    return (NULL);

            return OPENSSL_sk_delete(st, i);

    return NULL;

}



void *OPENSSL_sk_delete(OPENSSL_STACK *st, int loc)
@@ -174,7 +174,8 @@ void *OPENSSL_sk_delete(OPENSSL_STACK *st, int loc) 
    return (ret);

}



static int internal_find(OPENSSL_STACK *st, void *data, int ret_val_options)

static int internal_find(OPENSSL_STACK *st, const void *data,

                         int ret_val_options)

{

    const void *const *r;

    int i;
@@ -198,12 +199,12 @@ static int internal_find(OPENSSL_STACK *st, void *data, int ret_val_options) 
    return (int)((char **)r - st->data);

}



int OPENSSL_sk_find(OPENSSL_STACK *st, void *data)

int OPENSSL_sk_find(OPENSSL_STACK *st, const void *data)

{

    return internal_find(st, data, OBJ_BSEARCH_FIRST_VALUE_ON_MATCH);

}



int OPENSSL_sk_find_ex(OPENSSL_STACK *st, void *data)

int OPENSSL_sk_find_ex(OPENSSL_STACK *st, const void *data)

{

    return internal_find(st, data, OBJ_BSEARCH_VALUE_ON_NOMATCH);

}

include/openssl/lhash.h

+3 −3
Original line number Diff line number Diff line
@@ -153,15 +153,15 @@ void OPENSSL_LH_node_usage_stats_bio(const OPENSSL_LHASH *lh, BIO *out); 
    } \

    static ossl_inline void lh_##type##_node_stats_bio(const LHASH_OF(type) *lh, BIO *out) \

    { \

        OPENSSL_LH_node_stats_bio((OPENSSL_LHASH *)lh, out); \

        OPENSSL_LH_node_stats_bio((const OPENSSL_LHASH *)lh, out); \

    } \

    static ossl_inline void lh_##type##_node_usage_stats_bio(const LHASH_OF(type) *lh, BIO *out) \

    { \

        OPENSSL_LH_node_usage_stats_bio((OPENSSL_LHASH *)lh, out); \

        OPENSSL_LH_node_usage_stats_bio((const OPENSSL_LHASH *)lh, out); \

    } \

    static ossl_inline void lh_##type##_stats_bio(const LHASH_OF(type) *lh, BIO *out) \

    { \

        OPENSSL_LH_stats_bio((OPENSSL_LHASH *)lh, out); \

        OPENSSL_LH_stats_bio((const OPENSSL_LHASH *)lh, out); \

    } \

    static ossl_inline unsigned long lh_##type##_get_down_load(LHASH_OF(type) *lh) \

    { \

include/openssl/safestack.h

+4 −3
Original line number Diff line number Diff line
@@ -54,7 +54,8 @@ extern "C" { 
    } \

    static ossl_inline t2 *sk_##t1##_delete_ptr(STACK_OF(t1) *sk, t2 *ptr) \

    { \

        return (t2 *)OPENSSL_sk_delete_ptr((OPENSSL_STACK *)sk, (void *)ptr); \

        return (t2 *)OPENSSL_sk_delete_ptr((OPENSSL_STACK *)sk, \

                                           (const void *)ptr); \

    } \

    static ossl_inline int sk_##t1##_push(STACK_OF(t1) *sk, t2 *ptr) \

    { \
@@ -86,11 +87,11 @@ extern "C" { 
    } \

    static ossl_inline int sk_##t1##_find(STACK_OF(t1) *sk, t2 *ptr) \

    { \

        return OPENSSL_sk_find((OPENSSL_STACK *)sk, (void *)ptr); \

        return OPENSSL_sk_find((OPENSSL_STACK *)sk, (const void *)ptr); \

    } \

    static ossl_inline int sk_##t1##_find_ex(STACK_OF(t1) *sk, t2 *ptr) \

    { \

        return OPENSSL_sk_find_ex((OPENSSL_STACK *)sk, (void *)ptr); \

        return OPENSSL_sk_find_ex((OPENSSL_STACK *)sk, (const void *)ptr); \

    } \

    static ossl_inline void sk_##t1##_sort(STACK_OF(t1) *sk) \

    { \

include/openssl/stack.h

+3 −3
Original line number Diff line number Diff line
@@ -32,9 +32,9 @@ void OPENSSL_sk_pop_free(OPENSSL_STACK *st, void (*func) (void *)); 
OPENSSL_STACK *OPENSSL_sk_deep_copy(OPENSSL_STACK *, OPENSSL_sk_copyfunc c, OPENSSL_sk_freefunc f);

int OPENSSL_sk_insert(OPENSSL_STACK *sk, void *data, int where);

void *OPENSSL_sk_delete(OPENSSL_STACK *st, int loc);

void *OPENSSL_sk_delete_ptr(OPENSSL_STACK *st, void *p);

int OPENSSL_sk_find(OPENSSL_STACK *st, void *data);

int OPENSSL_sk_find_ex(OPENSSL_STACK *st, void *data);

void *OPENSSL_sk_delete_ptr(OPENSSL_STACK *st, const void *p);

int OPENSSL_sk_find(OPENSSL_STACK *st, const void *data);

int OPENSSL_sk_find_ex(OPENSSL_STACK *st, const void *data);

int OPENSSL_sk_push(OPENSSL_STACK *st, void *data);

int OPENSSL_sk_unshift(OPENSSL_STACK *st, void *data);

void *OPENSSL_sk_shift(OPENSSL_STACK *st);