X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fgmqcc.git;a=blobdiff_plain;f=util.c;h=92a99f76e463fb1e1d6289d53c629aa04cabfb21;hp=c2393f107bb1c205dcdf77167b521ff0560da2b3;hb=2d96b2a3ecb3610493c261c297da8a0ed429cd15;hpb=861987e13efd3967037017f74152bcc1afbbe257 diff --git a/util.c b/util.c index c2393f1..92a99f7 100644 --- a/util.c +++ b/util.c @@ -54,26 +54,18 @@ void *util_memory_a(size_t byte, unsigned int line, const char *file) { mem_start->prev = info; mem_start = info; - #if 0 - util_debug("MEM", "allocation: % 8u (bytes) address 0x%08X @ %s:%u\n", byte, data, file, line); - #endif - mem_at++; mem_ab += info->byte; return data; } -void util_memory_d(void *ptrn, unsigned int line, const char *file) { +void util_memory_d(void *ptrn) { struct memblock_t *info = NULL; if (!ptrn) return; info = ((struct memblock_t*)ptrn - 1); - #if 0 - util_debug("MEM", "released: % 8u (bytes) address 0x%08X @ %s:%u\n", info->byte, ptrn, file, line); - #endif - mem_db += info->byte; mem_dt++; @@ -95,20 +87,16 @@ void *util_memory_r(void *ptrn, size_t byte, unsigned int line, const char *file if (!ptrn) return util_memory_a(byte, line, file); if (!byte) { - util_memory_d(ptrn, line, file); + util_memory_d(ptrn); return NULL; } oldinfo = ((struct memblock_t*)ptrn - 1); newinfo = ((struct memblock_t*)malloc(sizeof(struct memblock_t) + byte)); - #if 0 - util_debug("MEM", "reallocation: % 8u -> %u (bytes) address 0x%08X -> 0x%08X @ %s:%u\n", oldinfo->byte, byte, ptrn, (void*)(newinfo+1), file, line); - #endif - /* new data */ if (!newinfo) { - util_memory_d(oldinfo+1, line, file); + util_memory_d(oldinfo+1); return NULL; }