Changeset 21760 for branches/gcc-kmk/tools/common/kFileLX.cpp

Timestamp:

Oct 29, 2011, 4:43:41 PM (14 years ago)

Author:

dmik

Message:

common: Use malloc/free for void pointers instead of new/delete.

This fixes GCC warnings and is more clear anyway (new/delete is for
types with the known structure).

File:

• branches/gcc-kmk/tools/common/kFileLX.cpp (modified) (6 diffs)

branches/gcc-kmk/tools/common/kFileLX.cpp

@@ -412 +412 @@
 
                 /* store status - current export entry */
-                PEXPSTATE pExpState = new EXPSTATE;
+                PEXPSTATE pExpState = (PEXPSTATE)malloc(sizeof(EXPSTATE));
                 pExport->pv         = pExpState;
                 pExpState->pb32     = pBundle;
@@ -560 +560 @@
 void kFileLX::exportFindClose(kExportEntry *pExport)
 {
-    delete pExport->pv;
+    free(pExport->pv);
     pExport->pv = NULL;
     return;
@@ -1375 +1375 @@
         )
     {
-        PLXRELOCSTATE  pState = new LXRELOCSTATE;
+        PLXRELOCSTATE  pState = (PLXRELOCSTATE)malloc(sizeof(LXRELOCSTATE));
         pState->ulSegment = ulSegment;
         pState->ulPage = paObject[ulSegment].o32_pagemap - 1;
@@ -1451 +1451 @@
                 if (preloc->isName())
                 {
-                    delete (void*)preloc->Info.Name.pszModule;
-                    delete (void*)preloc->Info.Name.pszName;
+                    delete preloc->Info.Name.pszModule;
+                    delete preloc->Info.Name.pszName;
                     preloc->Info.Name.pszName = preloc->Info.Name.pszModule = NULL;
                 }
@@ -1670 +1670 @@
     if (preloc->isName())
     {
-        delete (void*)preloc->Info.Name.pszModule;
-        delete (void*)preloc->Info.Name.pszName;
+        delete preloc->Info.Name.pszModule;
+        delete preloc->Info.Name.pszName;
         preloc->Info.Name.pszName = preloc->Info.Name.pszModule = NULL;
     }
@@ -1677 +1677 @@
     /* free state info */
     memset(preloc->pv1, 0xff, sizeof(LXRELOCSTATE));
-    delete preloc->pv1;
+    free(preloc->pv1);
     preloc->pv1 = (void*)0xdeadbeef;
 }