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

trunk/dll/objcnr.c

@@ -109 +109 @@
     if (!pciP) {
       Win_Error(hwndCnr, HWND_DESKTOP, pszSrcFile, __LINE__, "CM_ALLOCRECORD");
-      xfree(pffbArray, pszSrcFile, __LINE__);
+      free(pffbArray);
       return;
     }
@@ -134 +134 @@
   }
   else {
-    xfree(pffbArray, pszSrcFile, __LINE__);
+    free(pffbArray);
     Dos_Error(MB_ENTER, rc, HWND_DESKTOP, pszSrcFile, __LINE__,
               GetPString(IDS_CANTFINDDIRTEXT), filename);
@@ -155 +155 @@
   ri.fInvalidateRecord = TRUE;
   if (!WinSendMsg(hwndCnr, CM_INSERTRECORD, MPFROMP(pciP), MPFROMP(&ri))) {
-    xfree(pffbArray, pszSrcFile, __LINE__);
+    free(pffbArray);
     return;
   }
@@ -204 +204 @@
   }
 
-  xfree(pffbArray, pszSrcFile, __LINE__);
+  free(pffbArray);
   WinSendMsg(hwndCnr, CM_INVALIDATERECORD, MPFROMP(&pciP),
              MPFROM2SHORT(1, 0));
@@ -239 +239 @@
   PostMsg(WinQueryWindow(dirsize->hwndCnr, QW_PARENT), UM_CONTAINER_FILLED,
           MPVOID, MPVOID);
-  xfree(dirsize, pszSrcFile, __LINE__);
+  free(dirsize);
 # ifdef FORTIFY
   Fortify_LeaveScope();
@@ -290 +290 @@
         Runtime_Error(pszSrcFile, __LINE__,
                       GetPString(IDS_COULDNTSTARTTHREADTEXT));
-        xfree(dirsize, pszSrcFile, __LINE__);
+        free(dirsize);
 # ifdef FORTIFY
   Fortify_LeaveScope();