Ignore:
Timestamp:
Sep 2, 2007, 11:40:41 PM (18 years ago)
Author:
bird
Message:

error code cleanup.

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/kStuff/kLdr/tstkLdrMod.c

    r3571 r3579  
    3030*******************************************************************************/
    3131#include <k/kLdr.h>
     32#include <k/kErr.h>
     33#include <k/kErrors.h>
     34
    3235#include <stdarg.h>
    3336#include <stdio.h>
    … …  
    116119    rc = kLdrModGetBits(pMod, pvBits2, (KUPTR)pvBits, BasicTestsGetImport, NULL);
    117120    if (rc)
    118         return Failure("failed to get image bits, rc=%d (%s) (a)", rc, kLdrErrStr(rc));
     121        return Failure("failed to get image bits, rc=%d (%s) (a)", rc, kErrName(rc));
    119122    if (TestMemComp(pvBits2, pvBits, cbImage))
    120123        return Failure("relocation test failed, mismatching bits (a)");
    … …  
    125128    rc = kLdrModRelocateBits(pMod, pvBits2, 0x1000, (KUPTR)pvBits, BasicTestsGetImport, NULL);
    126129    if (rc)
    127         return Failure("failed to relocate, rc=%d (%s) (b1)", rc, kLdrErrStr(rc));
     130        return Failure("failed to relocate, rc=%d (%s) (b1)", rc, kErrName(rc));
    128131    rc = kLdrModRelocateBits(pMod, pvBits2, (KUPTR)pvBits, 0x1000, BasicTestsGetImport, NULL);
    129132    if (rc)
    130         return Failure("failed to relocate, rc=%d (%s) (b2)", rc, kLdrErrStr(rc));
     133        return Failure("failed to relocate, rc=%d (%s) (b2)", rc, kErrName(rc));
    131134    if (TestMemComp(pvBits2, pvBits, cbImage))
    132135        return Failure("relocation test failed, mismatching bits (b)");
    … …  
    138141    rc = kLdrModRelocateBits(pMod, pvBits, 0x1000000, (KUPTR)pvBits, BasicTestsGetImport, NULL);
    139142    if (rc)
    140         return Failure("failed to relocate, rc=%d (%s) (c1)", rc, kLdrErrStr(rc));
     143        return Failure("failed to relocate, rc=%d (%s) (c1)", rc, kErrName(rc));
    141144    memset(pvBits2, 0xfe, cbImage);
    142145    rc = kLdrModGetBits(pMod, pvBits2, 0x1000000, BasicTestsGetImport, NULL);
    143146    if (rc)
    144         return Failure("failed to get image bits, rc=%d (%s) (c1)", rc, kLdrErrStr(rc));
     147        return Failure("failed to get image bits, rc=%d (%s) (c1)", rc, kErrName(rc));
    145148    if (TestMemComp(pvBits2, pvBits, cbImage))
    146149        return Failure("relocation test failed, mismatching bits (c1)");
    … …  
    149152    rc = kLdrModRelocateBits(pMod, pvBits, ~(KUPTR)0x1010000, 0x1000000, BasicTestsGetImport, NULL);
    150153    if (rc)
    151         return Failure("failed to relocate, rc=%d (%s) (c2)", rc, kLdrErrStr(rc));
     154        return Failure("failed to relocate, rc=%d (%s) (c2)", rc, kErrName(rc));
    152155    memset(pvBits2, 0xef, cbImage);
    153156    rc = kLdrModGetBits(pMod, pvBits2, ~(KUPTR)0x1010000, BasicTestsGetImport, NULL);
    154157    if (rc)
    155         return Failure("failed to get image bits, rc=%d (%s) (c2)", rc, kLdrErrStr(rc));
     158        return Failure("failed to get image bits, rc=%d (%s) (c2)", rc, kErrName(rc));
    156159    if (TestMemComp(pvBits2, pvBits, cbImage))
    157160        return Failure("relocation test failed, mismatching bits (c2)");
    … …  
    160163    rc = kLdrModRelocateBits(pMod, pvBits, MY_BASEADDRESS, ~(KUPTR)0x1010000, BasicTestsGetImport, NULL);
    161164    if (rc)
    162         return Failure("failed to relocate, rc=%d (%s) (c3)", rc, kLdrErrStr(rc));
     165        return Failure("failed to relocate, rc=%d (%s) (c3)", rc, kErrName(rc));
    163166    memset(pvBits2, 0xef, cbImage);
    164167    rc = kLdrModGetBits(pMod, pvBits2, MY_BASEADDRESS, BasicTestsGetImport, NULL);
    165168    if (rc)
    166         return Failure("failed to get image bits, rc=%d (%s) (c3)", rc, kLdrErrStr(rc));
     169        return Failure("failed to get image bits, rc=%d (%s) (c3)", rc, kErrName(rc));
    167170    if (TestMemComp(pvBits2, pvBits, cbImage))
    168171        return Failure("relocation test failed, mismatching bits (c3)");
    … …  
    171174    rc = kLdrModRelocateBits(pMod, pvBits, ~(KUPTR)0 / 2 - 0x10000, MY_BASEADDRESS, BasicTestsGetImport, NULL);
    172175    if (rc)
    173         return Failure("failed to relocate, rc=%d %(s) (c4)", rc, kLdrErrStr(rc));
     176        return Failure("failed to relocate, rc=%d %(s) (c4)", rc, kErrName(rc));
    174177    memset(pvBits2, 0xdc, cbImage);
    175178    rc = kLdrModGetBits(pMod, pvBits2, ~(KUPTR)0 / 2 - 0x10000, BasicTestsGetImport, NULL);
    176179    if (rc)
    177         return Failure("failed to get image bits, rc=%d (%s) (c4)", rc, kLdrErrStr(rc));
     180        return Failure("failed to get image bits, rc=%d (%s) (c4)", rc, kErrName(rc));
    178181    if (TestMemComp(pvBits2, pvBits, cbImage))
    179182        return Failure("relocation test failed, mismatching bits (c4)");
    … …  
    182185    rc = kLdrModRelocateBits(pMod, pvBits, (KUPTR)pvBits, ~(KUPTR)0 / 2 - 0x10000, BasicTestsGetImport, NULL);
    183186    if (rc)
    184         return Failure("failed to relocate, rc=%d (%s) (c5)", rc, kLdrErrStr(rc));
     187        return Failure("failed to relocate, rc=%d (%s) (c5)", rc, kErrName(rc));
    185188    memset(pvBits2, 0xcd, cbImage);
    186189    rc = kLdrModGetBits(pMod, pvBits2, (KUPTR)pvBits, BasicTestsGetImport, NULL);
    187190    if (rc)
    188         return Failure("failed to get image bits, rc=%d (%s) (c5)", rc, kLdrErrStr(rc));
     191        return Failure("failed to get image bits, rc=%d (%s) (c5)", rc, kErrName(rc));
    189192    if (TestMemComp(pvBits2, pvBits, cbImage))
    190193        return Failure("relocation test failed, mismatching bits (c5)");
    … …  
    217220                                &uValue2, &fKind2);
    218221        if (rc)
    219             return Failure("Couldn't find symbol %#x (%.*s) by ordinal. rc=%d (%s)", iSymbol, cchSymbol, pchSymbol, rc, kLdrErrStr(rc));
     222            return Failure("Couldn't find symbol %#x (%.*s) by ordinal. rc=%d (%s)", iSymbol, cchSymbol, pchSymbol, rc, kErrName(rc));
    220223        if (uValue != uValue2)
    221224            return Failure("Symbol %#x (%.*s): Value mismatch %016" PRI_KLDRADDR " != %016" PRI_KLDRADDR " (enum!=query/ord)  pvBits=%p",
    … …  
    233236                                NULL, NULL, &uValue2, &fKind2);
    234237        if (rc)
    235             return Failure("Couldn't find symbol %#x (%.*s) by name. rc=%d (%s)", iSymbol, cchSymbol, pchSymbol, rc, kLdrErrStr(rc));
     238            return Failure("Couldn't find symbol %#x (%.*s) by name. rc=%d (%s)", iSymbol, cchSymbol, pchSymbol, rc, kErrName(rc));
    236239        if (uValue != uValue2)
    237240            return Failure("Symbol %#x (%.*s): Value mismatch %016" PRI_KLDRADDR " != %016" PRI_KLDRADDR " (enum!=query/name) pvBits=%p",
    … …  
    294297        rc = kLdrModGetImport(pMod, pvBits, i, szImportModule, sizeof(szImportModule));
    295298        if (rc)
    296             return Failure("failed to get import module name, rc=%d (%s). (%.260s)", rc, kLdrErrStr(rc), szImportModule);
     299            return Failure("failed to get import module name, rc=%d (%s). (%.260s)", rc, kErrName(rc), szImportModule);
    297300        printf("import #%d: '%s'\n", i, szImportModule);
    298301    }
    … …  
    307310    rc = kLdrModGetStackInfo(pMod, pvBits, MY_BASEADDRESS, &StackInfo);
    308311    if (rc)
    309         return Failure("kLdrModGetStackInfo failed with rc=%d (%s)", rc, kLdrErrStr(rc));
     312        return Failure("kLdrModGetStackInfo failed with rc=%d (%s)", rc, kErrName(rc));
    310313    printf("Stack: Address=%016" PRI_KLDRADDR "   LinkAddress=%016" PRI_KLDRADDR "\n"
    311314           "       cbStack=%016" PRI_KLDRSIZE " cbStackThread=%016" PRI_KLDRSIZE "\n",
    … …  
    326329    rc = kLdrModQueryMainEntrypoint(pMod, pvBits, MY_BASEADDRESS, &MainEPAddress);
    327330    if (rc)
    328         return Failure("kLdrModQueryMainEntrypoint failed with rc=%d (%s)", rc, kLdrErrStr(rc));
     331        return Failure("kLdrModQueryMainEntrypoint failed with rc=%d (%s)", rc, kErrName(rc));
    329332    printf("Entrypoint: %016" PRI_KLDRADDR "\n", MainEPAddress);
    330333    if (MainEPAddress == ~(KLDRADDR)42)
    … …  
    344347        printf("NO Debugger Information\n");
    345348    else
    346         return Failure("kLdrModHasDbgInfo failed with rc=%d (%s)", rc, kLdrErrStr(rc));
     349        return Failure("kLdrModHasDbgInfo failed with rc=%d (%s)", rc, kErrName(rc));
    347350    rc = kLdrModEnumDbgInfo(pMod, pvBits, BasicTestEnumDbgInfoCallback, NULL);
    348351    if (rc)
    349         return Failure("kLdrModEnumDbgInfo failed with rc=%d (%s)", rc, kLdrErrStr(rc));
     352        return Failure("kLdrModEnumDbgInfo failed with rc=%d (%s)", rc, kErrName(rc));
    350353
    351354
    … …  
    379382    rc = kLdrModEnumSymbols(pMod, pvBits, MY_BASEADDRESS, 0, BasicTestsEnumSymCallback, pvBits);
    380383    if (rc)
    381         return Failure("kLdrModEnumSymbols failed with rc=%d (%s)", rc, kLdrErrStr(rc));
     384        return Failure("kLdrModEnumSymbols failed with rc=%d (%s)", rc, kErrName(rc));
    382385
    383386
    … …  
    488491    rc = kLdrModGetBits(pMod, pvBits, (KUPTR)pvBits, BasicTestsGetImport, NULL);
    489492    if (rc)
    490         return Failure("failed to get image bits, rc=%d (%s)", rc, kLdrErrStr(rc));
     493        return Failure("failed to get image bits, rc=%d (%s)", rc, kErrName(rc));
    491494
    492495    /*
    … …  
    523526    rc = kLdrModFixupMapping(pMod, BasicTestsGetImport, NULL);
    524527    if (rc)
    525         return Failure("kLdrModFixupMapping (a) failed, rc=%d (%s)", rc, kLdrErrStr(rc));
     528        return Failure("kLdrModFixupMapping (a) failed, rc=%d (%s)", rc, kErrName(rc));
    526529
    527530    rc = kLdrModReload(pMod);
    528531    if (rc)
    529         return Failure("kLdrModReload (a) failed, rc=%d (%s)", rc, kLdrErrStr(rc));
     532        return Failure("kLdrModReload (a) failed, rc=%d (%s)", rc, kErrName(rc));
    530533
    531534    rc = kLdrModReload(pMod);
    532535    if (rc)
    533         return Failure("kLdrModReload (b) failed, rc=%d (%s)", rc, kLdrErrStr(rc));
     536        return Failure("kLdrModReload (b) failed, rc=%d (%s)", rc, kErrName(rc));
    534537
    535538    rc = kLdrModFixupMapping(pMod, BasicTestsGetImport, NULL);
    536539    if (rc)
    537         return Failure("kLdrModFixupMapping (b) failed, rc=%d (%s)", rc, kLdrErrStr(rc));
     540        return Failure("kLdrModFixupMapping (b) failed, rc=%d (%s)", rc, kErrName(rc));
    538541
    539542    rc = kLdrModAllocTLS(pMod);
    540543    if (rc)
    541         return Failure("kLdrModAllocTLS (a) failed, rc=%d (%s)", rc, kLdrErrStr(rc));
     544        return Failure("kLdrModAllocTLS (a) failed, rc=%d (%s)", rc, kErrName(rc));
    542545    kLdrModFreeTLS(pMod);
    543546
    544547    rc = kLdrModAllocTLS(pMod);
    545548    if (rc)
    546         return Failure("kLdrModAllocTLS (b) failed, rc=%d (%s)", rc, kLdrErrStr(rc));
     549        return Failure("kLdrModAllocTLS (b) failed, rc=%d (%s)", rc, kErrName(rc));
    547550    kLdrModFreeTLS(pMod);
    548551
    … …  
    553556    rc = BasicTestsSub2(pMod, NULL);
    554557    if (rc)
    555         return Failure("BasicTestsSub2 in Map2 failed, rc=%d (%s)", rc, kLdrErrStr(rc));
     558        return Failure("BasicTestsSub2 in Map2 failed, rc=%d (%s)", rc, kErrName(rc));
    556559    return 0;
    557560}
    … …  
    568571    rc = kLdrModMap(pMod);
    569572    if (rc)
    570         return Failure("kLdrModMap failed, rc=%d (%s)", rc, kLdrErrStr(rc));
     573        return Failure("kLdrModMap failed, rc=%d (%s)", rc, kErrName(rc));
    571574    rc = BasicTestsSubMap2(pMod);
    572575    rc2 = kLdrModUnmap(pMod);
    573576    if (rc2)
    574577    {
    575         Failure("kLdrModUnmap failed, rc=%d (%s)", rc2, kLdrErrStr(rc2));
     578        Failure("kLdrModUnmap failed, rc=%d (%s)", rc2, kErrName(rc2));
    576579        rc = rc ? rc : rc2;
    577580    }
    … …  
    601604        rc2 = kLdrModClose(pMod);
    602605        if (rc2)
    603             Failure("failed to close '%s', rc=%d (%s)", pszFilename, rc, kLdrErrStr(rc));
     606            Failure("failed to close '%s', rc=%d (%s)", pszFilename, rc, kErrName(rc));
    604607        if (rc2 && !rc)
    605608            rc = rc2;
    606609    }
    607610    else
    608         Failure("Failed to open '%s', rc=%d (%s)", pszFilename, rc, kLdrErrStr(rc));
     611        Failure("Failed to open '%s', rc=%d (%s)", pszFilename, rc, kErrName(rc));
    609612    return rc ? 1 : 0;
    610613}
Note: See TracChangeset for help on using the changeset viewer.