summaryrefslogtreecommitdiff
path: root/src/util/Malloc.c
diff options
context:
space:
mode:
authorallen <allen@17b73243-c579-4c4c-a9d2-2d5706c11dac>2000-03-30 23:12:18 +0000
committerallen <allen@17b73243-c579-4c4c-a9d2-2d5706c11dac>2000-03-30 23:12:18 +0000
commitc6c1711b0ffe691d7e8819ebedd0526afbedaf8a (patch)
tree9419a28b3b0aa8b478bd7a2504da66122eff6acb /src/util/Malloc.c
parent468e43bc8431d700aa5b4d0a60aa1bcb0148744a (diff)
Removing compiler warnings
git-svn-id: http://svn.cactuscode.org/flesh/trunk@1505 17b73243-c579-4c4c-a9d2-2d5706c11dac
Diffstat (limited to 'src/util/Malloc.c')
-rw-r--r--src/util/Malloc.c14
1 files changed, 8 insertions, 6 deletions
diff --git a/src/util/Malloc.c b/src/util/Malloc.c
index 94a04a3f..0e1fec2f 100644
--- a/src/util/Malloc.c
+++ b/src/util/Malloc.c
@@ -13,6 +13,7 @@
#include <stdlib.h>
#include <string.h>
+#include "cctk_WarnLevel.h"
#include "cctk_Malloc.h"
#include "StoreHandledData.h"
@@ -146,7 +147,7 @@ void *CCTKi_Malloc(size_t size, int line, const char *file)
void *CCTKi_Realloc(void *pointer, size_t size, int line, const char *file)
{
- t_mallocinfo tmp,*info;
+ t_mallocinfo *info;
char *data;
char mess[256];
@@ -415,11 +416,12 @@ long int CCTK_MemTicketCash(int this_ticket)
t_memticket *tmem;
if (tmem = (t_memticket*) Util_GetHandledData(ticketDB, this_ticket))
- {
- tsize = tmem->size;
- tdiff = CCTK_TotalMemory() - tsize;
- }
- else {
+ {
+ tsize = tmem->size;
+ tdiff = CCTK_TotalMemory() - tsize;
+ }
+ else
+ {
printf("CCTK_MemTicketCash: Cannot find ticket %d \n", this_ticket);
tdiff = 42;
}