IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Ignore:
Timestamp:
Feb 7, 2007, 1:52:54 PM (19 years ago)
Author:
jhoblitt
Message:

update psAbort() API:

add noreturn attribute
remove unneeded 'name' params
turn into a macro so file/line/func are automatiically passed

Location:
trunk/psLib/test/types
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • trunk/psLib/test/types/tst_psBitSet.c

    r8966 r11686  
    1717 *  @author  Ross Harman, MHPCC
    1818 *
    19  *  @version $Revision: 1.2 $  $Name: not supported by cvs2svn $
    20  *  @date  $Date: 2006-09-26 01:47:22 $
     19 *  @version $Revision: 1.3 $  $Name: not supported by cvs2svn $
     20 *  @date  $Date: 2007-02-07 23:52:54 $
    2121 *
    2222 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    123123            psBitSetTest(bs,23) ) {
    124124
    125         psAbort("testBitSet01b","psBitSetAlloc failed to clear all bits at allocation.");
     125        psAbort("psBitSetAlloc failed to clear all bits at allocation.");
    126126    }
    127127
    … …  
    135135    bs = psBitSetSet(bs, 23);
    136136    if(bs != tempBs) {
    137         psAbort("testBitSet01b",
    138                 "Return pointer not equal to output argument pointer.");
     137        psAbort(                "Return pointer not equal to output argument pointer.");
    139138    }
    140139    if(bs->bits[0] != 0x05) {
    141         psAbort(__func__,
    142                 "Unexpected value for first byte (%d vs 5).",
     140        psAbort(                "Unexpected value for first byte (%d vs 5).",
    143141                bs->bits[0]);
    144142    }
    … …  
    154152            ! psBitSetTest(bs,23) ) {
    155153
    156         psAbort("testBitSet01b","Failed to set a bit.");
     154        psAbort("Failed to set a bit.");
    157155    }
    158156
    … …  
    173171            psBitSetTest(bs,23) ) {
    174172
    175         psAbort("testBitSet01b","Failed to clear a bit.");
     173        psAbort("Failed to clear a bit.");
    176174    }
    177175
    … …  
    195193    if (err->code != PS_ERR_BAD_PARAMETER_VALUE) {
    196194        psErrorStackPrint(stderr,"Error Stack:");
    197         psAbort("testBitSet01c","psBitSetSet(bs, -4) didn't generate expected error.\n");
     195        psAbort("psBitSetSet(bs, -4) didn't generate expected error.\n");
    198196    }
    199197    psFree(err);
    … …  
    206204    if (err->code != PS_ERR_BAD_PARAMETER_VALUE) {
    207205        psErrorStackPrint(stderr,"Error Stack:");
    208         psAbort("testBitSet01c","psBitSetSet(bs, 200) didn't generate expected error.\n");
     206        psAbort("psBitSetSet(bs, 200) didn't generate expected error.\n");
    209207    }
    210208    psFree(err);
    … …  
    217215    if (err->code != PS_ERR_BAD_PARAMETER_NULL) {
    218216        psErrorStackPrint(stderr,"Error Stack:");
    219         psAbort("testBitSet01c","psBitSetSet(NULL,0) didn't generate expected error.\n");
     217        psAbort("psBitSetSet(NULL,0) didn't generate expected error.\n");
    220218    }
    221219    psFree(err);
    … …  
    242240            ! psBitSetTest(bs,23) ) {
    243241
    244         psAbort("testBitSet01c","Set bits returned false.");
     242        psAbort("Set bits returned false.");
    245243    }
    246244
    … …  
    248246    psErrorClear();
    249247    if(psBitSetTest(bs, -4)) {
    250         psAbort("testBitSet01c","psBitSetTest returned true with negative bit position.\n");
     248        psAbort("psBitSetTest returned true with negative bit position.\n");
    251249    }
    252250
    … …  
    254252    if (err->code != PS_ERR_BAD_PARAMETER_VALUE) {
    255253        psErrorStackPrint(stderr,"Error Stack:");
    256         psAbort("testBitSet01c","psBitSetTest(bs, -4) didn't generate proper error.\n");
     254        psAbort("psBitSetTest(bs, -4) didn't generate proper error.\n");
    257255    }
    258256    psFree(err);
    … …  
    261259    psErrorClear();
    262260    if(psBitSetTest(bs, 200)) {
    263         psAbort("testBitSet01c","psBitSetTest returned true with too-large bit position.\n");
     261        psAbort("psBitSetTest returned true with too-large bit position.\n");
    264262    }
    265263
    … …  
    267265    if (err->code != PS_ERR_BAD_PARAMETER_VALUE) {
    268266        psErrorStackPrint(stderr,"Error Stack:");
    269         psAbort("testBitSet01c","psBitSetTest(bs, 200) didn't generate proper error.\n");
     267        psAbort("psBitSetTest(bs, 200) didn't generate proper error.\n");
    270268    }
    271269    psFree(err);
    … …  
    274272    psErrorClear();
    275273    if (psBitSetTest(NULL, 0)) {
    276         psAbort("testBitSet01c","psBitSetTest returned true with NULL psBitSet.\n");
     274        psAbort("psBitSetTest returned true with NULL psBitSet.\n");
    277275    }
    278276
    … …  
    280278    if (err->code != PS_ERR_BAD_PARAMETER_NULL) {
    281279        psErrorStackPrint(stderr,"Error Stack:");
    282         psAbort("testBitSet01c","psBitSetTest(NULL, 0) didn't generate proper error.\n");
     280        psAbort("psBitSetTest(NULL, 0) didn't generate proper error.\n");
    283281    }
    284282    psFree(err);
    … …  
    323321    outbs = psBitSetOp(outbs, bs1, "AND", bs2);
    324322    if (outbs == NULL) {
    325         psAbort(__func__,"psBitSetOp returned a NULL result for AND operation");
     323        psAbort("psBitSetOp returned a NULL result for AND operation");
    326324    }
    327325
    … …  
    333331            binOut2 = psBitSetToString(bs2);
    334332            binOut3 = psBitSetToString(outbs);
    335             psAbort(__func__,"psBitSetOp with AND operator failed.\nInput was %s, %s.  Output was %s",
     333            psAbort("psBitSetOp with AND operator failed.\nInput was %s, %s.  Output was %s",
    336334                    binOut1,binOut2,binOut3);
    337335        }
    … …  
    343341    outbs = psBitSetOp(NULL, bs1, "AND", bs2);
    344342    if (outbs == NULL) {
    345         psAbort(__func__,"psBitSetOp failed to create a new psBitSet for the result");
     343        psAbort("psBitSetOp failed to create a new psBitSet for the result");
    346344    }
    347345    for(psS32 i=0; i<24; i++) {
    … …  
    352350            binOut2 = psBitSetToString(bs2);
    353351            binOut3 = psBitSetToString(outbs);
    354             psAbort(__func__,"psBitSetOp with AND operator failed.\nInput was %s, %s.  Output was %s",
     352            psAbort("psBitSetOp with AND operator failed.\nInput was %s, %s.  Output was %s",
    355353                    binOut1,binOut2,binOut3);
    356354        }
    … …  
    400398    outbs = psBitSetOp(outbs, bs1, "OR", bs2);
    401399    if (outbs == NULL) {
    402         psAbort(__func__,"psBitSetOp returned a NULL result for OR operation");
     400        psAbort("psBitSetOp returned a NULL result for OR operation");
    403401    }
    404402
    … …  
    410408            binOut2 = psBitSetToString(bs2);
    411409            binOut3 = psBitSetToString(outbs);
    412             psAbort(__func__,"psBitSetOp with OR operator failed.\nInput was %s, %s.  Output was %s",
     410            psAbort("psBitSetOp with OR operator failed.\nInput was %s, %s.  Output was %s",
    413411                    binOut1,binOut2,binOut3);
    414412        }
    … …  
    420418    outbs = psBitSetOp(NULL, bs1, "OR", bs2);
    421419    if (outbs == NULL) {
    422         psAbort(__func__,"psBitSetOp failed to create a new psBitSet for the result");
     420        psAbort("psBitSetOp failed to create a new psBitSet for the result");
    423421    }
    424422    for(psS32 i=0; i<24; i++) {
    … …  
    429427            binOut2 = psBitSetToString(bs2);
    430428            binOut3 = psBitSetToString(outbs);
    431             psAbort(__func__,"psBitSetOp with OR operator failed.\nInput was %s, %s.  Output was %s",
     429            psAbort("psBitSetOp with OR operator failed.\nInput was %s, %s.  Output was %s",
    432430                    binOut1,binOut2,binOut3);
    433431        }
    … …  
    478476    outbs = psBitSetOp(outbs, bs1, "XOR", bs2);
    479477    if (outbs == NULL) {
    480         psAbort(__func__,"psBitSetOp returned a NULL result for XOR operation");
     478        psAbort("psBitSetOp returned a NULL result for XOR operation");
    481479    }
    482480
    … …  
    488486            binOut2 = psBitSetToString(bs2);
    489487            binOut3 = psBitSetToString(outbs);
    490             psAbort(__func__,"psBitSetOp with XOR operator failed.\nInput was %s, %s.  Output was %s",
     488            psAbort("psBitSetOp with XOR operator failed.\nInput was %s, %s.  Output was %s",
    491489                    binOut1,binOut2,binOut3);
    492490        }
    … …  
    498496    outbs = psBitSetOp(NULL, bs1, "XOR", bs2);
    499497    if (outbs == NULL) {
    500         psAbort(__func__,"psBitSetOp failed to create a new psBitSet for the result");
     498        psAbort("psBitSetOp failed to create a new psBitSet for the result");
    501499    }
    502500    for(psS32 i=0; i<24; i++) {
    … …  
    507505            binOut2 = psBitSetToString(bs2);
    508506            binOut3 = psBitSetToString(outbs);
    509             psAbort(__func__,"psBitSetOp with XOR operator failed.\nInput was %s, %s.  Output was %s",
     507            psAbort("psBitSetOp with XOR operator failed.\nInput was %s, %s.  Output was %s",
    510508                    binOut1,binOut2,binOut3);
    511509        }
    … …  
    549547    outbs = psBitSetNot(outbs, bs1);
    550548    if (outbs == NULL) {
    551         psAbort(__func__,"psBitSetOp returned a NULL result for NOT operation");
     549        psAbort("psBitSetOp returned a NULL result for NOT operation");
    552550    }
    553551
    … …  
    558556            binOut1 = psBitSetToString(bs1);
    559557            binOut2 = psBitSetToString(outbs);
    560             psAbort(__func__,"psBitSetOp with NOT operator failed.\nInput was %s.  Output was %s",
     558            psAbort("psBitSetOp with NOT operator failed.\nInput was %s.  Output was %s",
    561559                    binOut1,binOut2);
    562560        }
    … …  
    568566    outbs = psBitSetNot(NULL, bs1);
    569567    if (outbs == NULL) {
    570         psAbort(__func__,"psBitSetOp failed to create a new psBitSet for the result");
     568        psAbort("psBitSetOp failed to create a new psBitSet for the result");
    571569    }
    572570    for(psS32 i=0; i<24; i++) {
    … …  
    576574            binOut1 = psBitSetToString(bs1);
    577575            binOut2 = psBitSetToString(outbs);
    578             psAbort(__func__,"psBitSetOp with NOT operator failed.\nInput was %s.  Output was %s",
     576            psAbort("psBitSetOp with NOT operator failed.\nInput was %s.  Output was %s",
    579577                    binOut1,binOut2);
    580578        }
    … …  
    605603    psBitSet* outbs = psBitSetOp(NULL, bs1, "XOR", bs2);
    606604    if (outbs != NULL) {
    607         psAbort(__func__,"psBitSetOp did not return a NULL result when input sizes differ");
     605        psAbort("psBitSetOp did not return a NULL result when input sizes differ");
    608606    }
    609607
    … …  
    611609    if (err->code != PS_ERR_BAD_PARAMETER_SIZE) {
    612610        psErrorStackPrint(stderr,"Error Stack:");
    613         psAbort(__func__,"psBitSetOp didn't generate expected error with operands' sizes differed.");
     611        psAbort("psBitSetOp didn't generate expected error with operands' sizes differed.");
    614612    }
    615613    psFree(err);
    … …  
    623621    psBitSet* outbs2 = psBitSetOp(outbs, bs1, "XOR", bs2);
    624622    if (outbs2 == NULL) {
    625         psAbort(__func__,"psBitSetOp failed when input size and output size differed (a recoverable error).");
     623        psAbort("psBitSetOp failed when input size and output size differed (a recoverable error).");
    626624    }
    627625    if (outbs2 != outbs) {
    628         psAbort(__func__,"psBitSetOp didn't reuse the given output struct.");
     626        psAbort("psBitSetOp didn't reuse the given output struct.");
    629627    }
    630628    if (outbs2->n != bs1->n) {
    631         psAbort(__func__,"psBitSetOp did properly adjust the output psBitSet size.");
     629        psAbort("psBitSetOp did properly adjust the output psBitSet size.");
    632630    }
    633631
    … …  
    636634    outbs = psBitSetOp(outbs, bs1, "FOO", bs2);
    637635    if (outbs != NULL) {
    638         psAbort(__func__,"psBitSetOp returned something in case of a bogus operation.");
     636        psAbort("psBitSetOp returned something in case of a bogus operation.");
    639637    }
    640638    err = psErrorLast();
    641639    if (err->code != PS_ERR_BAD_PARAMETER_VALUE) {
    642640        psErrorStackPrint(stderr,"Error Stack:");
    643         psAbort(__func__,"psBitSetOp didn't generate expected error with bogus operator.");
     641        psAbort("psBitSetOp didn't generate expected error with bogus operator.");
    644642    }
    645643    psFree(err);
    … …  
    655653    if (err->code != PS_ERR_BAD_PARAMETER_VALUE) {
    656654        psErrorStackPrint(stderr,"Error Stack:");
    657         psAbort(__func__,"psBitSetOp didn't generate expected error with bogus operator.");
     655        psAbort("psBitSetOp didn't generate expected error with bogus operator.");
    658656    }
    659657    psFree(err);

  • trunk/psLib/test/types/tst_psHash00.c

    r4547 r11686  
    5757    memLeaks = psMemCheckLeaks(currentId,NULL,stderr,false);
    5858    if (0 != memLeaks) {
    59         psAbort(__func__,"Memory Leaks! (%d leaks)", memLeaks);
     59        psAbort("Memory Leaks! (%d leaks)", memLeaks);
    6060    }
    6161    psMemCheckCorruption(1);

  • trunk/psLib/test/types/tst_psHash01.c

    r4547 r11686  
    148148    memLeaks = psMemCheckLeaks(currentId,NULL,stderr,false);
    149149    if (memLeaks != 0) {
    150         psAbort(__func__,"Memory Leaks! (%d leaks)", memLeaks);
     150        psAbort("Memory Leaks! (%d leaks)", memLeaks);
    151151    }
    152152    psMemCheckCorruption(1);

  • trunk/psLib/test/types/tst_psHash02.c

    r4547 r11686  
    106106    memLeaks = psMemCheckLeaks(currentId,NULL,stderr,false);
    107107    if (0 != memLeaks) {
    108         psAbort(__func__,"Memory Leaks! (%d leaks)", memLeaks);
     108        psAbort("Memory Leaks! (%d leaks)", memLeaks);
    109109    }
    110110    psMemCheckCorruption(1);

  • trunk/psLib/test/types/tst_psHash03.c

    r4547 r11686  
    134134    memLeaks = psMemCheckLeaks(currentId,NULL,stdout,false);
    135135    if (memLeaks != 0) {
    136         psAbort(__func__,"Memory Leaks! (%d leaks)", memLeaks);
     136        psAbort("Memory Leaks! (%d leaks)", memLeaks);
    137137    }
    138138    psMemCheckCorruption(true);

  • trunk/psLib/test/types/tst_psHash04.c

    r4547 r11686  
    7777    memLeaks = psMemCheckLeaks(currentId,NULL,stderr,false);
    7878    if (memLeaks != 0) {
    79         psAbort(__func__,"Memory Leaks! (%d leaks)", memLeaks);
     79        psAbort("Memory Leaks! (%d leaks)", memLeaks);
    8080    }
    8181    psMemCheckCorruption(1);
Note: See TracChangeset for help on using the changeset viewer.