about summary refs log tree commit diff
path: root/src/base
diff options
context:
space:
mode:
authoroy <Tom_Adams@web.de>2011-12-29 12:37:28 +0100
committeroy <Tom_Adams@web.de>2011-12-29 12:37:28 +0100
commit4f0ee26fcf1b7b65bcb113eb44dbb8d106b419c4 (patch)
treec9cad0d98385be82b05705afdbe91a8172ef0e81 /src/base
parent6e20c32859ee4518f398a12b65586463ddeecaab (diff)
downloadzcatch-4f0ee26fcf1b7b65bcb113eb44dbb8d106b419c4.tar.gz
zcatch-4f0ee26fcf1b7b65bcb113eb44dbb8d106b419c4.zip
removed some unused code
Diffstat (limited to 'src/base')
-rw-r--r--src/base/system.c6
-rw-r--r--src/base/system.h19
2 files changed, 3 insertions, 22 deletions
diff --git a/src/base/system.c b/src/base/system.c
index 4ea6d413..7b60dab5 100644
--- a/src/base/system.c
+++ b/src/base/system.c
@@ -142,8 +142,6 @@ void dbg_logger_file(const char *filename)
 }
 /* */
 
-int memory_alloced = 0;
-
 typedef struct MEMHEADER
 {
 	const char *filename;
@@ -165,8 +163,10 @@ void *mem_alloc_debug(const char *filename, int line, unsigned size, unsigned al
 {
 	/* TODO: fix alignment */
 	/* TODO: add debugging */
+	MEMTAIL *tail;
 	MEMHEADER *header = (struct MEMHEADER *)malloc(size+sizeof(MEMHEADER)+sizeof(MEMTAIL));
-	MEMTAIL *tail = (struct MEMTAIL *)(((char*)(header+1))+size);
+	dbg_assert(header != 0, "mem_alloc failure");
+	tail = (struct MEMTAIL *)(((char*)(header+1))+size);
 	header->size = size;
 	header->filename = filename;
 	header->line = line;
diff --git a/src/base/system.h b/src/base/system.h
index aaa5b43f..749668de 100644
--- a/src/base/system.h
+++ b/src/base/system.h
@@ -1130,25 +1130,6 @@ void mem_debug_dump(IOHANDLE file);
 
 void swap_endian(void *data, unsigned elem_size, unsigned num);
 
-/* Group: Debug levels */
-//by format
-enum {
-	DBG_FMT_RAW				= 1,	//raw output
-	DBG_FMT_TIME			= 2,	//show time
-	DBG_FMT_SYS				= 3,	//show sys
-	DBG_FMT_FULL			= 4		//show both
-};
-
-enum {
-	DBG_LEVEL_IMPORTANT			= 0,	//important always showed messages
-	DBG_LEVEL_ERROR				= 1,	//error messages
-	DBG_LEVEL_WARNING			= 2,	//warning messages
-	DBG_LEVEL_MSG				= 3,	//extra debug messages
-	DBG_LEVEL_INFO				= 4		//info messages
-};
-
-#define DBG_LEVEL_LOW DBG_LEVEL_IMPORTANT
-#define DBG_LEVEL_HIGH DBG_LEVEL_INFO
 
 typedef void (*DBG_LOGGER)(const char *line);
 void dbg_logger(DBG_LOGGER logger);