Fix output of util_memory_d

[xonotic/gmqcc.git] / util.c

diff --git a/util.c b/util.c
index 4f4092830e539e5dece0e6d47bab273653a2cfbc..54fe21299d48a1f89a681673778282118cda1780 100644 (file)
--- a/util.c
+++ b/util.c
@@ -37,7 +37,7 @@ struct memblock_t {
 
 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*)((uintptr_t)info+sizeof(struct memblock_t));
+    void              *data =(void*)((unsigned char*)info+sizeof(struct memblock_t));
     if (!data) return NULL;
     info->line = line;
     info->byte = byte;
@@ -54,10 +54,10 @@ 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*)((uintptr_t)ptrn-sizeof(struct memblock_t));
+    data = (void*)((unsigned char *)ptrn-sizeof(struct memblock_t));
     info = (struct memblock_t*)data;
 
-    util_debug("MEM", "released:   % 8u (bytes) address 0x%08X @ %s:%u\n", info->byte, data, file, line);
+    util_debug("MEM", "released:   % 8u (bytes) address 0x%08X @ %s:%u\n", info->byte, ptrn, file, line);
     mem_db += info->byte;
     mem_dt++;
 
@@ -329,7 +329,7 @@ int util_getline(char **lineptr, size_t *n, FILE *stream) {
     if (!lineptr || !n || !stream)
         return -1;
     if (!*lineptr) {
-        if (!(*lineptr = mem_a((*n=64))))
+        if (!(*lineptr = (char*)mem_a((*n=64))))
             return -1;
     }
 
@@ -340,12 +340,12 @@ int util_getline(char **lineptr, size_t *n, FILE *stream) {
         int c = getc(stream);
 
         if (chr < 2) {
-            char *tmp = mem_a((*n+=(*n>16)?*n:64));
+            char *tmp = (char*)mem_a((*n+=(*n>16)?*n:64));
             if  (!tmp)
                 return -1;
 
+            memcpy(tmp, *lineptr, pos - *lineptr);
             chr = *n + *lineptr - pos;
-            strcpy(tmp,*lineptr);
             if (!(*lineptr = tmp)) {
                 mem_d (tmp);
                 return -1;
@@ -385,7 +385,7 @@ size_t util_strtocmd(const char *in, char *out, size_t outsz) {
     return sz-1;
 }
 
-size_t util_strtononcmd(const char *, char *, size_t) {
+size_t util_strtononcmd(const char *in, char *out, size_t outsz) {
     size_t sz = 1;
     for (; *in && sz < outsz; ++in, ++out, ++sz) {
         if (*in == '_')
@@ -398,3 +398,16 @@ size_t util_strtononcmd(const char *, char *, size_t) {
     *out = 0;
     return sz-1;
 }
+
+FILE *util_fopen(const char *filename, const char *mode)
+{
+#ifdef WIN32
+    FILE *out;
+    if (fopen_s(&out, filename, mode) != 0)
+        return NULL;
+    return out;
+#else
+    return fopen(filename, mode);
+#endif
+}
+