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

trunk/dll/arccnrs.c

@@ -1442 +1442 @@
         if (!dcd->info->extract) {
           Runtime_Error(pszSrcFile, __LINE__, "no extract");
-          xfree(s, pszSrcFile, __LINE__);
+          free(s);
           return 0;
         }
@@ -1472 +1472 @@
         }
         // printf("%s %d UM_ENTER %s %s\n",__FILE__, __LINE__,filename, s); fflush(stdout);     // 10 Mar 07 SHL hang
-        xfree(s, pszSrcFile, __LINE__);
+        free(s);
         if (IsFile(filename) == 1) {
 #if 1 // 06 Oct 07 SHL fixme to be gone - set to 0 for ticket #58 testing
@@ -1750 +1750 @@
                   strcat(p, temp);
                   li->list[x] = p;
-                  xfree(temp, pszSrcFile, __LINE__);
+                  free(temp);
                 }
               }
@@ -1997 +1997 @@
       FreeList(dcd->lastselection);
       WinSendMsg(dcd->hwndCnr, UM_CLOSE, MPVOID, MPVOID);
-      xfree(dcd, pszSrcFile, __LINE__);
+      free(dcd);
 # ifdef FORTIFY
   Fortify_LeaveScope();
@@ -2551 +2551 @@
         hwnd = StartMLEEditor(dcd->hwndParent,
                               (INT)mp1, (CHAR *)mp2, dcd->hwndFrame);
-      xfree((CHAR *)mp2, pszSrcFile, __LINE__);
+      free((CHAR *)mp2);
       return MRFROMLONG(hwnd);
     }
@@ -2920 +2920 @@
                 BldFullPathName(s, dcd->workdir, li->list[x]);
                 if (IsFile(s) != 1) {
-                  xfree(li->list[x], pszSrcFile, __LINE__);
+                  free(li->list[x]);
                   li->list[x] = NULL;
                   for (y = x; li->list[y]; y++)
@@ -2932 +2932 @@
                   p = xstrdup(s, pszSrcFile, __LINE__);
                   if (p) {
-                    xfree(li->list[x], pszSrcFile, __LINE__);
+                    free(li->list[x]);
                     li->list[x] = p;
                   }
@@ -2980 +2980 @@
             }
             else
-              xfree(li, pszSrcFile, __LINE__);
+              free(li);
 # ifdef FORTIFY
   Fortify_LeaveScope();
@@ -3244 +3244 @@
               if (!PostMsg(dcd->hwndObject, UM_ENTER, MPFROMP(s), MPVOID)) {
                 Runtime_Error(pszSrcFile, __LINE__, "post");
-                xfree(s, pszSrcFile, __LINE__);
+                free(s);
               }
             }
@@ -3540 +3540 @@
                      IDS_WINCREATEWINDOW);
           PostMsg(hwndClient, WM_CLOSE, MPVOID, MPVOID);
-          xfree(dcd, pszSrcFile, __LINE__);
+          free(dcd);
 # ifdef FORTIFY
   Fortify_LeaveScope();