moving -Olocal-temps to -O4 until the issues are solved

[xonotic/gmqcc.git] / util.c

diff --git a/util.c b/util.c
index c2393f107bb1c205dcdf77167b521ff0560da2b3..d427c38fbf273a92ea24de3da9f39f9ccf8def58 100644 (file)
--- 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;
     }
 
@@ -782,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;