Ignore:
Timestamp:
Dec 18, 2011, 10:28:22 PM (14 years ago)
Author:
dmik
Message:

Merge branch gcc-kmk to trunk.

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • trunk

    • Property svn:ignore

      •  

        old new  
        1 bin
        2 Makefile.inc
         1env.cmd
         2LocalConfig.kmk
    • Property svn:mergeinfo set to
      /branches/gcc-kmkmergedeligible

  • trunk/tools/common/kFileLX.cpp

    r8003 r21916  
    256256 * @param     pszFilename   LX executable image name.
    257257 */
    258 kFileLX::kFileLX(const char *pszFilename) :
     258kFileLX::kFileLX(const char *pszFilename) throw (kError) :
    259259    kFileFormatBase(NULL), pvBase(NULL)
    260260{
    … …  
    292292 * @param     pFile     Pointer to opened LX file.
    293293 */
    294 kFileLX::kFileLX(kFile *pFile) :
     294kFileLX::kFileLX(kFile *pFile) throw (kError) :
    295295    kFileFormatBase(pFile), pvBase(NULL)
    296296{
    … …  
    330330 * Destructor.
    331331 */
    332 kFileLX::~kFileLX()
     332kFileLX::~kFileLX() throw (kError)
    333333{
    334334    if (pvBase != NULL)
    … …  
    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}
Note: See TracChangeset for help on using the changeset viewer.