Let's care about the compiler warnings for both cases, shall we?

[openssl.git] / crypto / mem.c

diff --git a/crypto/mem.c b/crypto/mem.c
index a9529ee274efe119044ba791309cc0947eac49b5..5a661e5f45ae4930d5eff2349e7a558d9275371f 100644 (file)
--- a/crypto/mem.c
+++ b/crypto/mem.c
@@ -93,7 +93,7 @@ static void (*free_func)(void *)            = free;
   static void (*realloc_debug_func)()= NULL;
   static void (*free_debug_func)()= NULL;
   static void (*set_debug_options_func)()= NULL;
-  static int (*get_debug_options_func)()= NULL;
+  static long (*get_debug_options_func)()= NULL;
 #endif
 
 
@@ -159,7 +159,7 @@ void CRYPTO_get_mem_debug_functions(void (**m)(), void (**r)(), void (**f)(),voi
        }
 
 
-void *CRYPTO_malloc_locked(int num, char *file, int line)
+void *CRYPTO_malloc_locked(int num, const char *file, int line)
        {
        char *ret = NULL;
 
@@ -191,7 +191,7 @@ void CRYPTO_free_locked(void *str)
                free_debug_func(NULL, 1);
        }
 
-void *CRYPTO_malloc(int num, char *file, int line)
+void *CRYPTO_malloc(int num, const char *file, int line)
        {
        char *ret = NULL;
 
@@ -211,7 +211,7 @@ void *CRYPTO_malloc(int num, char *file, int line)
        return ret;
        }
 
-void *CRYPTO_realloc(void *str, int num, char *file, int line)
+void *CRYPTO_realloc(void *str, int num, const char *file, int line)
        {
        char *ret = NULL;
 
@@ -239,7 +239,7 @@ void CRYPTO_free(void *str)
                free_debug_func(NULL, 1);
        }
 
-void *CRYPTO_remalloc(void *a, int num, char *file, int line)
+void *CRYPTO_remalloc(void *a, int num, const char *file, int line)
        {
        if (a != NULL) Free(a);
        a=(char *)Malloc(num);
@@ -253,7 +253,7 @@ void CRYPTO_set_mem_debug_options(long bits)
                set_debug_options_func(bits);
        }
 
-long CRYPTO_get_mem_debug_options()
+long CRYPTO_get_mem_debug_options(void)
        {
        if (get_debug_options_func != NULL)
                return get_debug_options_func();