Replaced a direct call to "malloc" and "free", and removed several misuses of "Z_Mall...

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@4075 d7cf8633-e32d-0410-b094-e92efae38249

diff --git a/cl_particles.c b/cl_particles.c
index 790abe05826c89efc035c87814271b1fde9f032f..18ad1fc550259316b6819e8afdfb806a9613d7eb 100644 (file)
--- a/cl_particles.c
+++ b/cl_particles.c
@@ -88,7 +88,7 @@ void fractalnoise(qbyte *noise, int size, int startgrid)
        startgrid = bound(0, startgrid, size);
 
        amplitude = 0xFFFF; // this gets halved before use
-       noisebuf = malloc(size*size*sizeof(int));
+       noisebuf = Mem_Alloc (tempmempool, size * size * sizeof (*noisebuf));
        memset(noisebuf, 0, size*size*sizeof(int));
 
        for (g2 = startgrid;g2;g2 >>= 1)
@@ -130,7 +130,7 @@ void fractalnoise(qbyte *noise, int size, int startgrid)
        for (y = 0;y < size;y++)
                for (x = 0;x < size;x++)
                        *noise++ = (qbyte) (((n(x,y) - min) * 256) / max);
-       free(noisebuf);
+       Mem_Free (noisebuf);
 #undef n
 }
 void VectorVectors(const vec3_t forward, vec3_t right, vec3_t up)

diff --git a/cmd.c b/cmd.c
index acba1396069493e161ac993c16e460446ae56ff0..2e134d7885047530f1a227f5168ae765ed5c1281 100644 (file)
--- a/cmd.c
+++ b/cmd.c
@@ -115,25 +115,25 @@ void Cbuf_InsertText (const char *text)
        char    *temp;
        int             templen;
 
-// copy off any commands still remaining in the exec buffer
+       // copy off any commands still remaining in the exec buffer
        templen = cmd_text.cursize;
        if (templen)
        {
-               temp = Z_Malloc (templen);
+               temp = Mem_Alloc (tempmempool, templen);
                memcpy (temp, cmd_text.data, templen);
                SZ_Clear (&cmd_text);
        }
        else
-               temp = NULL;    // shut up compiler
+               temp = NULL;
 
-// add the entire text of the file
+       // add the entire text of the file
        Cbuf_AddText (text);
 
-// add the copied off data
-       if (templen)
+       // add the copied off data
+       if (temp != NULL)
        {
                SZ_Write (&cmd_text, temp, templen);
-               Z_Free (temp);
+               Mem_Free (temp);
        }
 }
 
@@ -237,7 +237,7 @@ void Cmd_StuffCmds_f (void)
        if (!s)
                return;
 
-       text = Z_Malloc (s+1);
+       text = Mem_Alloc (tempmempool, s + 1);
        text[0] = 0;
        for (i=1 ; i<com_argc ; i++)
        {
@@ -248,8 +248,8 @@ void Cmd_StuffCmds_f (void)
                        strcat (text, " ");
        }
 
-// pull out the commands
-       build = Z_Malloc (s+1);
+       // pull out the commands
+       build = Mem_Alloc (tempmempool, s + 1);
        build[0] = 0;
 
        for (i=0 ; i<s-1 ; i++)
@@ -274,8 +274,8 @@ void Cmd_StuffCmds_f (void)
        if (build[0])
                Cbuf_InsertText (build);
 
-       Z_Free (text);
-       Z_Free (build);
+       Mem_Free (text);
+       Mem_Free (build);
 }
 
 
@@ -330,15 +330,6 @@ Cmd_Alias_f
 Creates a new command that executes a command string (possibly ; seperated)
 ===============
 */
-static char *CopyString (char *in)
-{
-       char *out;
-
-       out = Z_Malloc (strlen(in)+1);
-       strcpy (out, in);
-       return out;
-}
-
 static void Cmd_Alias_f (void)
 {
        cmdalias_t      *a;
@@ -390,7 +381,8 @@ static void Cmd_Alias_f (void)
        }
        strlcat (cmd, "\n", sizeof (cmd));
 
-       a->value = CopyString (cmd);
+       a->value = Z_Malloc (strlen (cmd) + 1);
+       strcpy (a->value, cmd);
 }
 
 /*

diff --git a/fs.c b/fs.c
index 90ba0702bd5b88a617d8ca6dfdc8f7dfe4091287..e180f13d4ce077518f88b6e45e12fa0c7e096dc6 100644 (file)
--- a/fs.c
+++ b/fs.c
@@ -1900,7 +1900,7 @@ fssearch_t *FS_Search(const char *pattern, int caseinsensitive, int quiet)
        if (separator < colon)
                separator = colon;
        basepathlength = separator - pattern;
-       basepath = Z_Malloc(basepathlength + 1);
+       basepath = Mem_Alloc (tempmempool, basepathlength + 1);
        if (basepathlength)
                memcpy(basepath, pattern, basepathlength);
        basepath[basepathlength] = 0;
@@ -2004,7 +2004,7 @@ fssearch_t *FS_Search(const char *pattern, int caseinsensitive, int quiet)
                        stringlistfree(liststart);
        }
 
-       Z_Free(basepath);
+       Mem_Free(basepath);
        return search;
 }