Changeset 1039 for trunk/dll/cmdline.c

Timestamp:

Jul 6, 2008, 12:16:21 AM (17 years ago)

Author:

Gregg Young

Message:

Removed unnecessary xfrees and included fortify.h where needed; moved several misplaced (x)frees;

File:

• trunk/dll/cmdline.c (modified) (6 diffs)

trunk/dll/cmdline.c

@@ -37 +37 @@
 #include "fm3dll.h"
 #include "pathutil.h"                   // MaxCmdLineStr
+#include "fortify.h"
 
 static PSZ pszSrcFile = __FILE__;
@@ -88 +89 @@
             info->cmdline = xstrdup(pszCmdLine, pszSrcFile, __LINE__);
             if (!info->cmdline)
-              xfree(info, pszSrcFile, __LINE__);
+              free(info);
             else {
               info->next = NULL;
@@ -102 +103 @@
       fclose(fp);
     }
+    free(pszCmdLine);
   }
-  xfree(pszCmdLine, pszSrcFile, __LINE__);
   if (DoItYourself)
     DoItYourselfCmdLine = CmdLineHead;
@@ -185 +186 @@
         info = CmdLineHead;
         CmdLineHead = CmdLineHead->next;
-        xfree(info, pszSrcFile, __LINE__);
+        free(info);
       }
       if (DoItYourself)
@@ -214 +215 @@
         CmdLineHead = info->next;
       xfree(info->cmdline, pszSrcFile, __LINE__);
-      xfree(info, pszSrcFile, __LINE__);
+      free(info);
       if (DoItYourself)
         DoItYourselfCmdLine = CmdLineHead;
@@ -236 +237 @@
     next = info->next;
     xfree(info->cmdline, pszSrcFile, __LINE__);
-    xfree(info, pszSrcFile, __LINE__);
+    free(info);
     info = next;
   }