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

trunk/dll/remap.c

@@ -31 +31 @@
 #include "strutil.h"                    // GetPString
 #include "fm3dll.h"
+#include "fortify.h"
 
 #pragma data_seg(DATA1)
@@ -84 +85 @@
           info->res = xstrdup(s, pszSrcFile, __LINE__);
           if (!info->res)
-            xfree(info, pszSrcFile, __LINE__);
+            free(info);
           else {
             x++;
@@ -152 +153 @@
     info->res = xstrdup(res, pszSrcFile, __LINE__);
     if (!info->res)
-      xfree(info, pszSrcFile, __LINE__);
+      free(info);
     else {
       info->next = NULL;
@@ -162 +163 @@
         info = reshead;
         reshead = reshead->next;
-        xfree(info, pszSrcFile, __LINE__);
+        free(info);
       }
       return TRUE;
@@ -186 +187 @@
         reshead = info->next;
       xfree(info->res, pszSrcFile, __LINE__);
-      xfree(info, pszSrcFile, __LINE__);
+      free(info);
       return TRUE;
     }
@@ -203 +204 @@
     next = info->next;
     xfree(info->res, pszSrcFile, __LINE__);
-    xfree(info, pszSrcFile, __LINE__);
+    free(info);
     info = next;
   }
@@ -440 +441 @@
                    "%s", GetPString(IDS_CANTSTARTNETUSETEXT));
           if (!mp2 || (ULONG) mp2 == 1041 || info->failedonce)
-            xfree(info, pszSrcFile, __LINE__);
+            free(info);
           break;
         }
@@ -729 +730 @@
       while (info) {
         next = info->next;
-        xfree(info, pszSrcFile, __LINE__);
+        free(info);
         info = next;
       }