commit 6343829a391df59e46e513c84b6264ee71ad9518
author Geoff Thorpe <geoff@openssl.org> Wed Nov 12 03:58:08 2008 +0000
committer Geoff Thorpe <geoff@openssl.org> Wed Nov 12 03:58:08 2008 +0000
tree 9823103bf5828e47081ac906203516bdc332f577
parent 2401debe83e8df930907a39065ebf9a54354f123

Revert the size_t modifications from HEAD that had led to more
knock-on work than expected - they've been extracted into a patch
series that can be completed elsewhere, or in a different branch,
before merging back to HEAD.

crypto/mem.c

diff --git a/crypto/mem.c b/crypto/mem.c
index 97d47df..6f80dd3 100644
--- a/crypto/mem.c
+++ b/crypto/mem.c
@@ -103,9 +103,9 @@
 /* XXX use correct function pointer types */
 #ifdef CRYPTO_MDEBUG
 /* use default functions from mem_dbg.c */
-static void (*malloc_debug_func)(void *,size_t,const char *,int,int)
+static void (*malloc_debug_func)(void *,int,const char *,int,int)
 	= CRYPTO_dbg_malloc;
-static void (*realloc_debug_func)(void *,void *,size_t,const char *,int,int)
+static void (*realloc_debug_func)(void *,void *,int,const char *,int,int)
 	= CRYPTO_dbg_realloc;
 static void (*free_debug_func)(void *,int) = CRYPTO_dbg_free;
 static void (*set_debug_options_func)(long) = CRYPTO_dbg_set_options;
@@ -113,8 +113,8 @@
 #else
 /* applications can use CRYPTO_malloc_debug_init() to select above case
  * at run-time */
-static void (*malloc_debug_func)(void *,size_t,const char *,int,int) = NULL;
-static void (*realloc_debug_func)(void *,void *,size_t,const char *,int,int)
+static void (*malloc_debug_func)(void *,int,const char *,int,int) = NULL;
+static void (*realloc_debug_func)(void *,void *,int,const char *,int,int)
 	= NULL;
 static void (*free_debug_func)(void *,int) = NULL;
 static void (*set_debug_options_func)(long) = NULL;
@@ -178,8 +178,8 @@
 	return 1;
 	}
 
-int CRYPTO_set_mem_debug_functions(void (*m)(void *,size_t,const char *,int,int),
-				   void (*r)(void *,void *,size_t,const char *,int,int),
+int CRYPTO_set_mem_debug_functions(void (*m)(void *,int,const char *,int,int),
+				   void (*r)(void *,void *,int,const char *,int,int),
 				   void (*f)(void *,int),
 				   void (*so)(long),
 				   long (*go)(void))
@@ -233,8 +233,8 @@
 	if (f != NULL) *f=free_locked_func;
 	}
 
-void CRYPTO_get_mem_debug_functions(void (**m)(void *,size_t,const char *,int,int),
-				    void (**r)(void *,void *,size_t,const char *,int,int),
+void CRYPTO_get_mem_debug_functions(void (**m)(void *,int,const char *,int,int),
+				    void (**r)(void *,void *,int,const char *,int,int),
 				    void (**f)(void *,int),
 				    void (**so)(long),
 				    long (**go)(void))
@@ -247,7 +247,7 @@
 	}
 
 
-void *CRYPTO_malloc_locked(size_t num, const char *file, int line)
+void *CRYPTO_malloc_locked(int num, const char *file, int line)
 	{
 	void *ret = NULL;
 
@@ -291,7 +291,7 @@
 		free_debug_func(NULL, 1);
 	}
 
-void *CRYPTO_malloc(size_t num, const char *file, int line)
+void *CRYPTO_malloc(int num, const char *file, int line)
 	{
 	void *ret = NULL;
 
@@ -330,7 +330,7 @@
 	return ret;
 	}
 
-void *CRYPTO_realloc(void *str, size_t num, const char *file, int line)
+void *CRYPTO_realloc(void *str, int num, const char *file, int line)
 	{
 	void *ret = NULL;
 
@@ -351,8 +351,8 @@
 	return ret;
 	}
 
-void *CRYPTO_realloc_clean(void *str, size_t old_len, size_t num,
-			   const char *file, int line)
+void *CRYPTO_realloc_clean(void *str, int old_len, int num, const char *file,
+			   int line)
 	{
 	void *ret = NULL;
 
@@ -393,10 +393,10 @@
 		free_debug_func(NULL, 1);
 	}
 
-void *CRYPTO_remalloc(void *a, size_t num, const char *file, int line)
+void *CRYPTO_remalloc(void *a, int num, const char *file, int line)
 	{
 	if (a != NULL) OPENSSL_free(a);
-	a=OPENSSL_malloc(num);
+	a=(char *)OPENSSL_malloc(num);
 	return(a);
 	}