Changeset 1039 for trunk/dll/copyf.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/copyf.c (modified) (7 diffs)

trunk/dll/copyf.c

@@ -36 +36 @@
 #include "strutil.h"                    // GetPString
 #include "fm3dll.h"
+#include "fortify.h"
 
 static PSZ pszSrcFile = __FILE__;
@@ -237 +238 @@
           longname[CCHMAXPATH - 1] = 0;
         }
-        xfree(pfealist, pszSrcFile, __LINE__);
-      }
-      xfree(pgealist, pszSrcFile, __LINE__);
+        free(pfealist);
+      }
+      free(pgealist);
     }
   }
@@ -712 +713 @@
         /* under no circumstances! */
         Runtime_Error(pszSrcFile, __LINE__, "bad name %s", str);
-        xfree(str, pszSrcFile, __LINE__);
+        free(str);
         return -1;
       }
@@ -739 +740 @@
     xfree(ss, pszSrcFile, __LINE__);
     xfree(f, pszSrcFile, __LINE__);
-    xfree(str, pszSrcFile, __LINE__);
+    free(str);
     return -1;
   }
@@ -784 +785 @@
   }
 
-  xfree(f, pszSrcFile, __LINE__);
-  xfree(ss, pszSrcFile, __LINE__);
-  xfree(str, pszSrcFile, __LINE__);
+  free(f);
+  free(ss);
+  free(str);
   return 0;
 }
@@ -833 +834 @@
     xfree(ss, pszSrcFile, __LINE__);
     xfree(f, pszSrcFile, __LINE__);
-    xfree(str, pszSrcFile, __LINE__);
+    free(str);
     return -1;
   }
@@ -857 +858 @@
   }
 
-  xfree(f, pszSrcFile, __LINE__);
-  xfree(ss, pszSrcFile, __LINE__);
-  xfree(str, pszSrcFile, __LINE__);
+  free(f);
+  free(ss);
+  free(str);
   return 0;
 }