summaryrefslogtreecommitdiff
path: root/mysys/safemalloc.c
diff options
context:
space:
mode:
authorunknown <monty@mysql.com/narttu.mysql.fi>2008-01-13 00:30:38 +0200
committerunknown <monty@mysql.com/narttu.mysql.fi>2008-01-13 00:30:38 +0200
commit89ff50d4296e849cec70799f7bda8c6217601867 (patch)
tree73de231121178e9ffeb7e50acc0dfa24a5b2557d /mysys/safemalloc.c
parent0cccfe30cc5ba9e6b02b90eeec73753b5136f892 (diff)
downloadmariadb-git-89ff50d4296e849cec70799f7bda8c6217601867.tar.gz
Fixed compiler warnings
Fixed type that caused windows builds to fail include/my_alloc.h: Use size_t for memory areas instead of uint mysys/mf_iocache.c: Fixed compiler warnings by adding casts mysys/my_compress.c: Fixed compiler warnings by adding casts mysys/my_getsystime.c: Fixed typo mysys/my_static.h: Use size_t for memory areas mysys/safemalloc.c: Use size_t for memory areas storage/maria/ma_bitmap.c: Fixed compiler warnings by adding casts storage/maria/ma_blockrec.c: Fixed compiler warnings by adding casts storage/maria/ma_cache.c: Use size_t for memory areas storage/maria/ma_info.c: Use size_t for memory areas storage/maria/ma_key.c: Fixed compiler warnings by adding casts storage/maria/ma_locking.c: Fixed compiler warnings by adding casts storage/maria/ma_open.c: Fixed compiler warnings by adding casts storage/maria/ma_packrec.c: Fixed compiler warnings by fixing type for variable storage/maria/ma_statrec.c: Fixed compiler warnings by adding casts storage/maria/ma_write.c: Fixed compiler warnings by adding casts storage/maria/maria_def.h: Use size_t for memory areas storage/myisam/mi_search.c: Fixed compiler warnings by adding casts
Diffstat (limited to 'mysys/safemalloc.c')
-rw-r--r--mysys/safemalloc.c15
1 files changed, 9 insertions, 6 deletions
diff --git a/mysys/safemalloc.c b/mysys/safemalloc.c
index 6c8a080fbf3..1ccfa213756 100644
--- a/mysys/safemalloc.c
+++ b/mysys/safemalloc.c
@@ -404,14 +404,16 @@ void TERMINATE(FILE *file, uint flag)
if (file)
{
fprintf(file,
- "\t%6u bytes at 0x%09lx, allocated at line %4u in '%s'",
- irem->datasize, (long) data, irem->linenum, irem->filename);
+ "\t%6lu bytes at 0x%09lx, allocated at line %4u in '%s'",
+ (ulong) irem->datasize, (long) data,
+ irem->linenum, irem->filename);
fprintf(file, "\n");
(void) fflush(file);
}
DBUG_PRINT("safe",
- ("%6u bytes at 0x%09lx, allocated at line %4d in '%s'",
- irem->datasize, (long) data, irem->linenum, irem->filename));
+ ("%6lu bytes at 0x%09lx, allocated at line %4d in '%s'",
+ (ulong) irem->datasize, (long) data,
+ irem->linenum, irem->filename));
irem= irem->next;
}
}
@@ -445,8 +447,9 @@ void sf_malloc_report_allocated(void *memory)
sf_malloc_prehunc);
if (data <= (char*) memory && (char*) memory <= data + irem->datasize)
{
- printf("%u bytes at 0x%lx, allocated at line %u in '%s'\n",
- irem->datasize, (long) data, irem->linenum, irem->filename);
+ printf("%lu bytes at 0x%lx, allocated at line %u in '%s'\n",
+ (ulong) irem->datasize, (long) data,
+ irem->linenum, irem->filename);
break;
}
}