Ignore:
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).

Location:
branches/gcc-kmk/tools/common
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • branches/gcc-kmk/tools/common/kFileInterfaces.cpp

    r8003 r21760  
    1919*   Header Files                                                               *
    2020*******************************************************************************/
     21#include <malloc.h>
     22
    2123#include "kTypes.h"
    2224#include "kError.h"
    … …  
    6365     * Save the target we are searching for references to.
    6466     */
    65     PXREFSTATE  pState = new XREFSTATE;
     67    PXREFSTATE  pState = (PXREFSTATE)malloc(sizeof(XREFSTATE));
    6668    pState->ulSegment = ulSegment;
    6769    pState->offSegment = offSegment;
    … …  
    131133    kASSERT(preloc != NULL);
    132134    relocFindClose(preloc);
    133     delete preloc->pv2;
     135    free(preloc->pv2);
    134136    preloc->pv2 = NULL;
    135137}

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

    r21759 r21760  
    412412
    413413                /* store status - current export entry */
    414                 PEXPSTATE pExpState = new EXPSTATE;
     414                PEXPSTATE pExpState = (PEXPSTATE)malloc(sizeof(EXPSTATE));
    415415                pExport->pv         = pExpState;
    416416                pExpState->pb32     = pBundle;
    … …  
    560560void kFileLX::exportFindClose(kExportEntry *pExport)
    561561{
    562     delete pExport->pv;
     562    free(pExport->pv);
    563563    pExport->pv = NULL;
    564564    return;
    … …  
    13751375        )
    13761376    {
    1377         PLXRELOCSTATE  pState = new LXRELOCSTATE;
     1377        PLXRELOCSTATE  pState = (PLXRELOCSTATE)malloc(sizeof(LXRELOCSTATE));
    13781378        pState->ulSegment = ulSegment;
    13791379        pState->ulPage = paObject[ulSegment].o32_pagemap - 1;
    … …  
    14511451                if (preloc->isName())
    14521452                {
    1453                     delete (void*)preloc->Info.Name.pszModule;
    1454                     delete (void*)preloc->Info.Name.pszName;
     1453                    delete preloc->Info.Name.pszModule;
     1454                    delete preloc->Info.Name.pszName;
    14551455                    preloc->Info.Name.pszName = preloc->Info.Name.pszModule = NULL;
    14561456                }
    … …  
    16701670    if (preloc->isName())
    16711671    {
    1672         delete (void*)preloc->Info.Name.pszModule;
    1673         delete (void*)preloc->Info.Name.pszName;
     1672        delete preloc->Info.Name.pszModule;
     1673        delete preloc->Info.Name.pszName;
    16741674        preloc->Info.Name.pszName = preloc->Info.Name.pszModule = NULL;
    16751675    }
    … …  
    16771677    /* free state info */
    16781678    memset(preloc->pv1, 0xff, sizeof(LXRELOCSTATE));
    1679     delete preloc->pv1;
     1679    free(preloc->pv1);
    16801680    preloc->pv1 = (void*)0xdeadbeef;
    16811681}

  • branches/gcc-kmk/tools/common/kFilePE.cpp

    r21759 r21760  
    1111******************************************************************************/
    1212#include <string.h>
     13#include <malloc.h>
    1314
    1415#include "MZexe.h"
    … …  
    7677
    7778            /* create mapping */
    78    pvBase = new char [pehdr.OptionalHeader.SizeOfImage];
     79   pvBase = malloc(pehdr.OptionalHeader.SizeOfImage);
    7980   if (pvBase == NULL)
    8081       throw(kError(kError::NOT_ENOUGH_MEMORY));
    … …  
    139140   catch (kError err)
    140141   {
    141        delete(pvBase);
     142       free(pvBase);
    142143       pvBase = NULL;
    143144       throw(err);
    … …  
    152153{
    153154    if (pvBase)
    154         delete(pvBase);
     155        free(pvBase);
    155156}
    156157
Note: See TracChangeset for help on using the changeset viewer.