Signed vs. unsigned problem fix.

[oweals/openssl.git] / crypto / mem_dbg.c

diff --git a/crypto/mem_dbg.c b/crypto/mem_dbg.c
index 3c559e09960342b3f1325a7975244ac1d94f0641..ef19d8f8448992b1687872780ca6bd2b3f942053 100644 (file)
--- a/crypto/mem_dbg.c
+++ b/crypto/mem_dbg.c
@@ -235,43 +235,37 @@ long CRYPTO_dbg_get_options(void)
        return options;
        }
 
-/* static int mem_cmp(MEM *a, MEM *b) */
-static int mem_cmp(const void *a_void, const void *b_void)
+static int mem_cmp(MEM *a, MEM *b)
        {
-       return((const char *)((MEM *)a_void)->addr
-               - (const char *)((MEM *)b_void)->addr);
+       return((char *)a->addr - (char *)b->addr);
        }
 
-/* static unsigned long mem_hash(MEM *a) */
-static unsigned long mem_hash(const void *a_void)
+static unsigned long mem_hash(MEM *a)
        {
        unsigned long ret;
 
-       ret=(unsigned long)((const MEM *)a_void)->addr;
+       ret=(unsigned long)a->addr;
 
        ret=ret*17851+(ret>>14)*7+(ret>>4)*251;
        return(ret);
        }
 
-/* static int app_info_cmp(APP_INFO *a, APP_INFO *b) */
-static int app_info_cmp(const void *a_void, const void *b_void)
+static int app_info_cmp(APP_INFO *a, APP_INFO *b)
        {
-       return(((const APP_INFO *)a_void)->thread
-               != ((const APP_INFO *)b_void)->thread);
+       return(a->thread != b->thread);
        }
 
-/* static unsigned long app_info_hash(APP_INFO *a) */
-static unsigned long app_info_hash(const void *a_void)
+static unsigned long app_info_hash(APP_INFO *a)
        {
        unsigned long ret;
 
-       ret=(unsigned long)((const APP_INFO *)a_void)->thread;
+       ret=(unsigned long)a->thread;
 
        ret=ret*17851+(ret>>14)*7+(ret>>4)*251;
        return(ret);
        }
 
-static APP_INFO *pop_info(void)
+static APP_INFO *pop_info()
        {
        APP_INFO tmp;
        APP_INFO *ret = NULL;
@@ -288,7 +282,7 @@ static APP_INFO *pop_info(void)
                                next->references++;
                                lh_insert(amih,(char *)next);
                                }
-#ifdef LEVITTE_DEBUG_MEM
+#ifdef LEVITTE_DEBUG
                        if (ret->thread != tmp.thread)
                                {
                                fprintf(stderr, "pop_info(): deleted info has other thread ID (%lu) than the current thread (%lu)!!!!\n",
@@ -324,7 +318,7 @@ int CRYPTO_push_info_(const char *info, const char *file, int line)
                        }
                if (amih == NULL)
                        {
-                       if ((amih=lh_new(app_info_hash, app_info_cmp)) == NULL)
+                       if ((amih=lh_new(app_info_hash,app_info_cmp)) == NULL)
                                {
                                OPENSSL_free(ami);
                                ret=0;
@@ -341,7 +335,7 @@ int CRYPTO_push_info_(const char *info, const char *file, int line)
 
                if ((amim=(APP_INFO *)lh_insert(amih,(char *)ami)) != NULL)
                        {
-#ifdef LEVITTE_DEBUG_MEM
+#ifdef LEVITTE_DEBUG
                        if (ami->thread != amim->thread)
                                {
                                fprintf(stderr, "CRYPTO_push_info(): previous info has other thread ID (%lu) than the current thread (%lu)!!!!\n",
@@ -417,7 +411,7 @@ void CRYPTO_dbg_malloc(void *addr, int num, const char *file, int line,
                                }
                        if (mh == NULL)
                                {
-                               if ((mh=lh_new(mem_hash, mem_cmp)) == NULL)
+                               if ((mh=lh_new(mem_hash,mem_cmp)) == NULL)
                                        {
                                        OPENSSL_free(addr);
                                        OPENSSL_free(m);
@@ -441,8 +435,8 @@ void CRYPTO_dbg_malloc(void *addr, int num, const char *file, int line,
                                m->order=order;
                                }
                        m->order=order++;
-#ifdef LEVITTE_DEBUG_MEM
-                       fprintf(stderr, "LEVITTE_DEBUG_MEM: [%5d] %c 0x%p (%d)\n",
+#ifdef LEVITTE_DEBUG
+                       fprintf(stderr, "LEVITTE_DEBUG: [%5d] %c 0x%p (%d)\n",
                                m->order,
                                (before_p & 128) ? '*' : '+',
                                m->addr, m->num);
@@ -497,8 +491,8 @@ void CRYPTO_dbg_free(void *addr, int before_p)
                        mp=(MEM *)lh_delete(mh,(char *)&m);
                        if (mp != NULL)
                                {
-#ifdef LEVITTE_DEBUG_MEM
-                       fprintf(stderr, "LEVITTE_DEBUG_MEM: [%5d] - 0x%p (%d)\n",
+#ifdef LEVITTE_DEBUG
+                       fprintf(stderr, "LEVITTE_DEBUG: [%5d] - 0x%p (%d)\n",
                                mp->order, mp->addr, mp->num);
 #endif
                                if (mp->app_info != NULL)
@@ -522,8 +516,8 @@ void CRYPTO_dbg_realloc(void *addr1, void *addr2, int num,
        {
        MEM m,*mp;
 
-#ifdef LEVITTE_DEBUG_MEM
-       fprintf(stderr, "LEVITTE_DEBUG_MEM: --> CRYPTO_dbg_malloc(addr1 = %p, addr2 = %p, num = %d, file = \"%s\", line = %d, before_p = %d)\n",
+#ifdef LEVITTE_DEBUG
+       fprintf(stderr, "LEVITTE_DEBUG: --> CRYPTO_dbg_malloc(addr1 = %p, addr2 = %p, num = %d, file = \"%s\", line = %d, before_p = %d)\n",
                addr1, addr2, num, file, line, before_p);
 #endif
 
@@ -549,8 +543,8 @@ void CRYPTO_dbg_realloc(void *addr1, void *addr2, int num,
                        mp=(MEM *)lh_delete(mh,(char *)&m);
                        if (mp != NULL)
                                {
-#ifdef LEVITTE_DEBUG_MEM
-                               fprintf(stderr, "LEVITTE_DEBUG_MEM: [%5d] * 0x%p (%d) -> 0x%p (%d)\n",
+#ifdef LEVITTE_DEBUG
+                               fprintf(stderr, "LEVITTE_DEBUG: [%5d] * 0x%p (%d) -> 0x%p (%d)\n",
                                        mp->order,
                                        mp->addr, mp->num,
                                        addr2, num);
@@ -652,7 +646,7 @@ static void print_leak(MEM *m, MEM_LEAK *l)
                }
        while(amip && amip->thread == ti);
                
-#ifdef LEVITTE_DEBUG_MEM
+#ifdef LEVITTE_DEBUG
        if (amip)
                {
                fprintf(stderr, "Thread switch detected in backtrace!!!!\n");
@@ -661,8 +655,6 @@ static void print_leak(MEM *m, MEM_LEAK *l)
 #endif
        }
 
-static IMPLEMENT_LHASH_DOALL_ARG_FN(print_leak, MEM *, MEM_LEAK *)
-
 void CRYPTO_mem_leaks(BIO *b)
        {
        MEM_LEAK ml;
@@ -677,8 +669,7 @@ void CRYPTO_mem_leaks(BIO *b)
        ml.bytes=0;
        ml.chunks=0;
        if (mh != NULL)
-               lh_doall_arg(mh, LHASH_DOALL_ARG_FN(print_leak),
-                               (char *)&ml);
+               lh_doall_arg(mh,(void (*)())print_leak,(char *)&ml);
        if (ml.chunks != 0)
                {
                sprintf(buf,"%ld bytes leaked in %d chunks\n",
@@ -731,7 +722,7 @@ void CRYPTO_mem_leaks(BIO *b)
        MemCheck_on(); /* release MALLOC2 lock */
        }
 
-#ifndef OPENSSL_NO_FP_API
+#ifndef NO_FP_API
 void CRYPTO_mem_leaks_fp(FILE *fp)
        {
        BIO *b;
@@ -750,20 +741,16 @@ void CRYPTO_mem_leaks_fp(FILE *fp)
 /* FIXME: We really don't allow much to the callback.  For example, it has
    no chance of reaching the info stack for the item it processes.  Should
    it really be this way?  -- Richard Levitte */
-/* NB: The prototypes have been typedef'd to CRYPTO_MEM_LEAK_CB inside crypto.h
- * If this code is restructured, remove the callback type if it is no longer
- * needed. -- Geoff Thorpe */
-static void cb_leak(MEM *m, CRYPTO_MEM_LEAK_CB *cb)
+static void cb_leak(MEM *m,
+                   void (**cb)(unsigned long, const char *, int, int, void *))
        {
        (**cb)(m->order,m->file,m->line,m->num,m->addr);
        }
 
-static IMPLEMENT_LHASH_DOALL_ARG_FN(cb_leak, MEM *, CRYPTO_MEM_LEAK_CB *)
-
-void CRYPTO_mem_leaks_cb(CRYPTO_MEM_LEAK_CB cb)
+void CRYPTO_mem_leaks_cb(void (*cb)(unsigned long, const char *, int, int, void *))
        {
        if (mh == NULL) return;
        CRYPTO_w_lock(CRYPTO_LOCK_MALLOC2);
-       lh_doall_arg(mh, LHASH_DOALL_ARG_FN(cb_leak), &cb);
+       lh_doall_arg(mh,(void (*)())cb_leak,(void *)&cb);
        CRYPTO_w_unlock(CRYPTO_LOCK_MALLOC2);
        }