X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fgmqcc.git;a=blobdiff_plain;f=util.c;h=d427c38fbf273a92ea24de3da9f39f9ccf8def58;hp=5d0d683a0f11f3ac69cd9aa0101d62545c68662e;hb=52312791130eff70f21c428b23756a1b49e67804;hpb=686394654fff6ecfc4f6b9a76bec599585d56795 diff --git a/util.c b/util.c index 5d0d683..d427c38 100644 --- a/util.c +++ b/util.c @@ -54,20 +54,18 @@ void *util_memory_a(size_t byte, unsigned int line, const char *file) { 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++; 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); - util_debug("MEM", "released: % 8u (bytes) address 0x%08X @ %s:%u\n", info->byte, ptrn, file, line); mem_db += info->byte; mem_dt++; @@ -89,18 +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)); - util_debug("MEM", "reallocation: % 8u -> %u (bytes) address 0x%08X -> 0x%08X @ %s:%u\n", oldinfo->byte, byte, ptrn, (void*)(newinfo+1), file, line); - /* new data */ if (!newinfo) { - util_memory_d(oldinfo+1, line, file); + util_memory_d(oldinfo+1); return NULL; } @@ -774,8 +770,6 @@ int util_vasprintf(char **dat, const char *fmt, va_list args) { *dat = tmp; return len; #endif - /* never reached ... */ - return -1; } int util_asprintf(char **ret, const char *fmt, ...) { va_list args;