From 8599e70dd39c4cdc3da79fdc07859c911381b00b Mon Sep 17 00:00:00 2001 From: Daniel Veillard Date: Tue, 17 Jul 2001 21:38:51 +0000 Subject: [PATCH] debugging on IA64, fixed serious troubles due to size_t vs. int mismatch * xmlmemory.c include/libxml/xmlmemory.h: debugging on IA64, fixed serious troubles due to size_t vs. int mismatch Daniel --- ChangeLog | 5 +++++ include/libxml/xmlmemory.h | 8 ++++---- xmlmemory.c | 16 ++++++++-------- 3 files changed, 17 insertions(+), 12 deletions(-) diff --git a/ChangeLog b/ChangeLog index 406827e2..32755a5b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Tue Jul 17 17:36:46 EDT 2001 Daniel Veillard + + * xmlmemory.c include/libxml/xmlmemory.h: debugging on IA64, + fixed serious troubles due to size_t vs. int mismatch + Tue Jul 17 16:04:36 EDT 2001 Daniel Veillard * SAX.c xmlIO.c: cleaned up some warning on the Alpha diff --git a/include/libxml/xmlmemory.h b/include/libxml/xmlmemory.h index 90a1274a..e0cb81e1 100644 --- a/include/libxml/xmlmemory.h +++ b/include/libxml/xmlmemory.h @@ -51,8 +51,8 @@ extern "C" { * The XML memory wrapper support 4 basic overloadable functions */ typedef void (*xmlFreeFunc)(void *); -typedef void *(*xmlMallocFunc)(int); -typedef void *(*xmlReallocFunc)(void *, int); +typedef void *(*xmlMallocFunc)(size_t); +typedef void *(*xmlReallocFunc)(void *, size_t); typedef char *(*xmlStrdupFunc)(const char *); /* @@ -94,8 +94,8 @@ int xmlInitMemory (void); #define xmlRealloc(p, x) xmlReallocLoc((p), (x), __FILE__, __LINE__) #define xmlMemStrdup(x) xmlMemStrdupLoc((x), __FILE__, __LINE__) -void * xmlMallocLoc(int size, const char *file, int line); -void * xmlReallocLoc(void *ptr,int size, const char *file, int line); +void * xmlMallocLoc(size_t size, const char *file, int line); +void * xmlReallocLoc(void *ptr,size_t size, const char *file, int line); char * xmlMemStrdupLoc(const char *str, const char *file, int line); #endif /* DEBUG_MEMORY_LOCATION */ diff --git a/xmlmemory.c b/xmlmemory.c index 4a9350e6..aeb95c08 100644 --- a/xmlmemory.c +++ b/xmlmemory.c @@ -29,9 +29,9 @@ #include void xmlMallocBreakpoint(void); -void * xmlMemMalloc(int size); -void * xmlMallocLoc(int size, const char * file, int line); -void * xmlMemRealloc(void *ptr,int size); +void * xmlMemMalloc(size_t size); +void * xmlMallocLoc(size_t size, const char * file, int line); +void * xmlMemRealloc(void *ptr,size_t size); void xmlMemFree(void *ptr); char * xmlMemoryStrdup(const char *str); @@ -137,7 +137,7 @@ xmlMallocBreakpoint(void) { */ void * -xmlMallocLoc(int size, const char * file, int line) +xmlMallocLoc(size_t size, const char * file, int line) { MEMHDR *p; @@ -191,7 +191,7 @@ xmlMallocLoc(int size, const char * file, int line) */ void * -xmlMemMalloc(int size) +xmlMemMalloc(size_t size) { return(xmlMallocLoc(size, "none", 0)); } @@ -209,7 +209,7 @@ xmlMemMalloc(int size) */ void * -xmlReallocLoc(void *ptr,int size, const char * file, int line) +xmlReallocLoc(void *ptr,size_t size, const char * file, int line) { MEMHDR *p; unsigned long number; @@ -264,7 +264,7 @@ error: */ void * -xmlMemRealloc(void *ptr,int size) { +xmlMemRealloc(void *ptr,size_t size) { return(xmlReallocLoc(ptr, size, "none", 0)); } @@ -304,7 +304,7 @@ xmlMemFree(void *ptr) error: xmlGenericError(xmlGenericErrorContext, - "xmlFree(%X) error\n", (unsigned int) ptr); + "xmlFree(%lX) error\n", (unsigned long) ptr); return; }