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

trunk/dll/collect.c

@@ -907 +907 @@
             Runtime_Error(pszSrcFile, __LINE__,
                           GetPString(IDS_COULDNTSTARTTHREADTEXT));
-            xfree(wk, pszSrcFile, __LINE__);
+            free(wk);
 # ifdef FORTIFY
   Fortify_LeaveScope();
@@ -940 +940 @@
             Runtime_Error(pszSrcFile, __LINE__,
                           GetPString(IDS_COULDNTSTARTTHREADTEXT));
-            xfree(wk, pszSrcFile, __LINE__);
+            free(wk);
 # ifdef FORTIFY
   Fortify_LeaveScope();
@@ -968 +968 @@
       WinSendMsg(dcd->hwndCnr, UM_CLOSE, MPVOID, MPVOID);
       FreeList(dcd->lastselection);
-      xfree(dcd, pszSrcFile, __LINE__);
+      free(dcd);
 # ifdef FORTIFY
   Fortify_LeaveScope();
@@ -1467 +1467 @@
     if (mp1) {
       if (!dcd) {
-        xfree(mp1, pszSrcFile, __LINE__);
+        free(mp1);
 # ifdef FORTIFY
   Fortify_LeaveScope();
@@ -1476 +1476 @@
         if (!PostMsg(dcd->hwndObject, UM_COLLECTFROMFILE, mp1, mp2)) {
           Runtime_Error(pszSrcFile, __LINE__, "PostMsg");
-          xfree(mp1, pszSrcFile, __LINE__);
+          free(mp1);
 # ifdef FORTIFY
   Fortify_LeaveScope();
@@ -1605 +1605 @@
             if (p) {
               if (!PostMsg(hwnd, UM_COLLECTFROMFILE, MPFROMP(p), MPVOID))
-                xfree(p, pszSrcFile, __LINE__);
+                free(p);
 # ifdef FORTIFY
   Fortify_LeaveScope();
@@ -2124 +2124 @@
             }
             else
-              xfree(li, pszSrcFile, __LINE__);
+              free(li);
 # ifdef FORTIFY
   Fortify_LeaveScope();
@@ -2691 +2691 @@
         hwnd = StartMLEEditor(dcd->hwndParent,
                               (INT)mp1, (CHAR *)mp2, dcd->hwndFrame);
-      xfree((CHAR *)mp2, pszSrcFile, __LINE__);
+      free((CHAR *)mp2);
       return MRFROMLONG(hwnd);
     }
@@ -2884 +2884 @@
                    IDS_WINCREATEWINDOW);
         PostMsg(hwndClient, WM_CLOSE, MPVOID, MPVOID);
-        xfree(dcd, pszSrcFile, __LINE__);
+        free(dcd);
 # ifdef FORTIFY
   Fortify_LeaveScope();