aboutsummaryrefslogtreecommitdiffstats
path: root/xmlmemory.c
diff options
context:
space:
mode:
authorDaniel Veillard <veillard@src.gnome.org>2001-07-17 21:38:51 +0000
committerDaniel Veillard <veillard@src.gnome.org>2001-07-17 21:38:51 +0000
commit8599e70dd39c4cdc3da79fdc07859c911381b00b (patch)
tree42fd5ff8ea0a899021795c789d35a00492f85b09 /xmlmemory.c
parent8fcc494e64fd0c3d41c6b1d8abd4843c710b03f8 (diff)
downloadandroid_external_libxml2-8599e70dd39c4cdc3da79fdc07859c911381b00b.tar.gz
android_external_libxml2-8599e70dd39c4cdc3da79fdc07859c911381b00b.tar.bz2
android_external_libxml2-8599e70dd39c4cdc3da79fdc07859c911381b00b.zip
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
Diffstat (limited to 'xmlmemory.c')
-rw-r--r--xmlmemory.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/xmlmemory.c b/xmlmemory.c
index 4a9350e6..aeb95c08 100644
--- a/xmlmemory.c
+++ b/xmlmemory.c
@@ -29,9 +29,9 @@
#include <libxml/xmlerror.h>
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;
}