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

trunk/dll/draglist.c

@@ -356 +356 @@
           if (pDItem->hstrTargetName)
             DrgDeleteStrHandle(pDItem->hstrTargetName);
-          xfree(pDItem, pszSrcFile, __LINE__);
+          free(pDItem);
           // Last item not yet count so only decrement by one less than loop count
           // Unhilite code will adjust this when unhighliting
@@ -425 +425 @@
         if (pDItem->hstrTargetName)
           DrgDeleteStrHandle(pDItem->hstrTargetName);
-        xfree(pDItem, pszSrcFile, __LINE__);
+        free(pDItem);
         dcd->ulItemsToUnHilite = ulNumfiles + 1;        // +1 to ensure non-zero
         break;
@@ -471 +471 @@
             if (pDItem->hstrTargetName)
               DrgDeleteStrHandle(pDItem->hstrTargetName);
-            xfree(pDItem, pszSrcFile, __LINE__);
+            free(pDItem);
             // Last item not yet count so only decrement by one less than loop count
             if (c > 1) {
@@ -562 +562 @@
       FreeDragInfoData(hwndCnr, pDInfo);
   }
-
-  if (ppDItem)
-    xfree(ppDItem, pszSrcFile, __LINE__);
+  xfree(ppDItem, pszSrcFile, __LINE__);
   if (paDImgIcons && paDImgIcons != &dimgFakeIcon)
-    xfree(paDImgIcons, pszSrcFile, __LINE__);
+    free(paDImgIcons);
   DosPostEventSem(CompactSem);
   MarkAll(hwndCnr, TRUE, FALSE, TRUE);
@@ -678 +676 @@
         if (pDItem->hstrTargetName)
           DrgDeleteStrHandle(pDItem->hstrTargetName);
-        xfree(pDItem, pszSrcFile, __LINE__);
+        free(pDItem);
         // pDItem = NULL;       // Why bother, we can count - fixme to be gone
         dcd->ulItemsToUnHilite = ulNumfiles + 1;