Copy DH key (if available) in addition to the bare parameters

[openssl.git] / crypto / mem_dbg.c

diff --git a/crypto/mem_dbg.c b/crypto/mem_dbg.c
index d084b8c6ca4ca63ea173d2f636593b7d421b6cd1..14770c073377df6bc107b5ac89c197d38c89d286 100644 (file)
--- a/crypto/mem_dbg.c
+++ b/crypto/mem_dbg.c
@@ -214,7 +214,7 @@ void CRYPTO_dbg_set_options(long bits)
        options = bits;
        }
 
-long CRYPTO_dbg_get_options()
+long CRYPTO_dbg_get_options(void)
        {
        return options;
        }
@@ -257,7 +257,7 @@ static APP_INFO *pop_info()
        if (amih != NULL)
                {
                tmp.thread=CRYPTO_thread_id();
-               if ((ret=(APP_INFO *)lh_delete(amih,(char *)&tmp)) != NULL)
+               if ((ret=(APP_INFO *)lh_delete(amih,&tmp)) != NULL)
                        {
                        APP_INFO *next=ret->next;
 
@@ -667,8 +667,6 @@ union void_fn_to_char_u
        void (*fn_p)();
        };
 
-static void (*mem_cb)()=NULL;
-
 static void cb_leak(MEM *m, char *cb)
        {
        union void_fn_to_char_u mem_callback;