leaving the old crc in, commented out

[xonotic/gmqcc.git] / util.c

diff --git a/util.c b/util.c
index 54fe21299d48a1f89a681673778282118cda1780..8642f8bf890dab5c1f58a35ec5b0d5b112e33ca8 100644 (file)
--- a/util.c
+++ b/util.c
@@ -33,8 +33,12 @@ struct memblock_t {
     const char  *file;
     unsigned int line;
     unsigned int byte;
+    struct memblock_t *next;
+    struct memblock_t *prev;
 };
 
+static struct memblock_t *mem_start = NULL;
+
 void *util_memory_a(unsigned int byte, unsigned int line, const char *file) {
     struct memblock_t *info = malloc(sizeof(struct memblock_t) + byte);
     void              *data =(void*)((unsigned char*)info+sizeof(struct memblock_t));
@@ -42,6 +46,11 @@ void *util_memory_a(unsigned int byte, unsigned int line, const char *file) {
     info->line = line;
     info->byte = byte;
     info->file = file;
+    info->prev = NULL;
+    info->next = mem_start;
+    if (mem_start)
+        mem_start->prev = info;
+    mem_start = info;
 
     util_debug("MEM", "allocation: % 8u (bytes) address 0x%08X @ %s:%u\n", byte, data, file, line);
     mem_at++;
@@ -53,6 +62,7 @@ void *util_memory_a(unsigned int byte, unsigned int line, const char *file) {
 void util_memory_d(void *ptrn, unsigned int line, const char *file) {
     void              *data = NULL;
     struct memblock_t *info = NULL;
+
     if (!ptrn) return;
     data = (void*)((unsigned char *)ptrn-sizeof(struct memblock_t));
     info = (struct memblock_t*)data;
@@ -61,13 +71,29 @@ void util_memory_d(void *ptrn, unsigned int line, const char *file) {
     mem_db += info->byte;
     mem_dt++;
 
+    if (info->prev)
+        info->prev->next = info->next;
+    if (info->next)
+        info->next->prev = info->prev;
+    if (info == mem_start)
+        mem_start = info->next;
+
     free(data);
 }
 
 void util_meminfo() {
+    struct memblock_t *info;
+
     if (!opts_memchk)
         return;
 
+    for (info = mem_start; info; info = info->next) {
+        util_debug("MEM", "lost:       % 8u (bytes) at %s:%u\n",
+            info->byte,
+            info->file,
+            info->line);
+    }
+
     util_debug("MEM", "Memory information:\n\
         Total allocations:   %llu\n\
         Total deallocations: %llu\n\
@@ -172,6 +198,9 @@ void util_debug(const char *area, const char *ms, ...) {
     if (!opts_debug)
         return;
 
+    if (!strcmp(area, "MEM") && !opts_memchk)
+        return;
+
     va_start(va, ms);
     fprintf (stdout, "DEBUG: ");
     fputc   ('[',  stdout);
@@ -305,6 +334,8 @@ static const uint16_t util_crc16_table[] = {
 /*
  * Implements a CRC function for X worth bits using (uint[X]_t)
  * as type. and util_crc[X]_table.
+
+ * Quake expects a non-reflective CRC.
  */
 #define CRC(X) \
 uint##X##_t util_crc##X(const char *k, int len, const short clamp) {  \
@@ -316,6 +347,16 @@ uint##X##_t util_crc##X(const char *k, int len, const short clamp) {  \
 CRC(32)
 CRC(16)
 #undef CRC
+/*
+#define CRC(X) \
+uint##X##_t util_crc##X(const char *k, int len, const short clamp) {  \
+    register uint##X##_t h= (uint##X##_t)0xFFFFFFFF;                  \
+    for (; len; --len, ++k)                                           \
+        h = util_crc##X##_table[(h^((unsigned char)*k))&0xFF]^(h>>8); \
+    return (~h)%clamp;                                                \
+}
+*/
+
 
 /*
  * Implements libc getline for systems that don't have it, which is