IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Ignore:
Timestamp:
May 25, 2005, 10:26:55 AM (21 years ago)
Author:
gusciora
Message:

I renamed many of the PS_CHECK macros to PS_ASSERT...

Location:
trunk/psLib/src/collections
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • trunk/psLib/src/collections/psMetadata.c

    r3945 r4029  
    1212*  @author Ross Harman, MHPCC
    1313*
    14 *  @version $Revision: 1.62 $ $Name: not supported by cvs2svn $
    15 *  @date $Date: 2005-05-16 19:43:53 $
     14*  @version $Revision: 1.63 $ $Name: not supported by cvs2svn $
     15*  @date $Date: 2005-05-25 20:26:55 $
    1616*
    1717*  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    179179
    180180
    181     PS_PTR_CHECK_NULL(name,NULL);
     181    PS_ASSERT_PTR_NON_NULL(name,NULL);
    182182
    183183    // Allocate metadata item
    … …  
    275275    psMetadataItem *existingEntry = NULL;
    276276
    277     PS_PTR_CHECK_NULL(md,NULL);
    278     PS_PTR_CHECK_NULL(md->table,NULL);
    279     PS_PTR_CHECK_NULL(md->list,NULL);
    280     PS_PTR_CHECK_NULL(metadataItem,NULL);
    281     PS_PTR_CHECK_NULL(metadataItem->name,NULL);
     277    PS_ASSERT_PTR_NON_NULL(md,NULL);
     278    PS_ASSERT_PTR_NON_NULL(md->table,NULL);
     279    PS_ASSERT_PTR_NON_NULL(md->list,NULL);
     280    PS_ASSERT_PTR_NON_NULL(metadataItem,NULL);
     281    PS_ASSERT_PTR_NON_NULL(metadataItem->name,NULL);
    282282
    283283    mdTable = md->table;
    … …  
    410410psBool psMetadataRemove(psMetadata *md, psS32 where, const char *key)
    411411{
    412     PS_PTR_CHECK_NULL(md,NULL);
    413 
    414     PS_PTR_CHECK_NULL(md->list,NULL);
     412    PS_ASSERT_PTR_NON_NULL(md,NULL);
     413
     414    PS_ASSERT_PTR_NON_NULL(md->list,NULL);
    415415    psList* mdList = md->list;
    416416
    417     PS_PTR_CHECK_NULL(md->table,NULL);
     417    PS_ASSERT_PTR_NON_NULL(md->table,NULL);
    418418    psHash* mdTable = md->table;
    419419
    … …  
    482482
    483483
    484     PS_PTR_CHECK_NULL(md,NULL);
    485     PS_PTR_CHECK_NULL(md->table,NULL);
    486     PS_PTR_CHECK_NULL(key,NULL);
     484    PS_ASSERT_PTR_NON_NULL(md,NULL);
     485    PS_ASSERT_PTR_NON_NULL(md->table,NULL);
     486    PS_ASSERT_PTR_NON_NULL(key,NULL);
    487487
    488488    mdTable = md->table;
    … …  
    583583    psMetadataItem* entry = NULL;
    584584
    585     PS_PTR_CHECK_NULL(md,NULL);
    586     PS_PTR_CHECK_NULL(md->list,NULL);
     585    PS_ASSERT_PTR_NON_NULL(md,NULL);
     586    PS_ASSERT_PTR_NON_NULL(md->list,NULL);
    587587
    588588    entry = (psMetadataItem*) psListGet(md->list, where);
    … …  
    599599        const char* regex)
    600600{
    601     PS_PTR_CHECK_NULL(md,NULL);
    602     PS_PTR_CHECK_NULL(md->list,NULL);
     601    PS_ASSERT_PTR_NON_NULL(md,NULL);
     602    PS_ASSERT_PTR_NON_NULL(md->list,NULL);
    603603
    604604    psMetadataIterator* newIter = psAlloc(sizeof(psMetadataIterator));
    … …  
    637637    psMetadataItem* cursor;
    638638
    639     PS_PTR_CHECK_NULL(iterator,NULL);
     639    PS_ASSERT_PTR_NON_NULL(iterator,NULL);
    640640
    641641    psListIterator* iter = iterator->iter;
    642     PS_PTR_CHECK_NULL(iterator->iter,NULL);
     642    PS_ASSERT_PTR_NON_NULL(iterator->iter,NULL);
    643643
    644644    regex_t* preg = iterator->preg;
    … …  
    686686    psMetadataItem* oldValue;
    687687
    688     PS_PTR_CHECK_NULL(iterator,NULL);
     688    PS_ASSERT_PTR_NON_NULL(iterator,NULL);
    689689
    690690    psListIterator* iter = iterator->iter;
    691     PS_PTR_CHECK_NULL(iterator->iter,NULL);
     691    PS_ASSERT_PTR_NON_NULL(iterator->iter,NULL);
    692692
    693693    regex_t* preg = iterator->preg;
    … …  
    714714    psMetadataItem* oldValue;
    715715
    716     PS_PTR_CHECK_NULL(iterator,NULL);
     716    PS_ASSERT_PTR_NON_NULL(iterator,NULL);
    717717
    718718    psListIterator* iter = iterator->iter;
    719     PS_PTR_CHECK_NULL(iterator->iter,NULL);
     719    PS_ASSERT_PTR_NON_NULL(iterator->iter,NULL);
    720720
    721721    regex_t* preg = iterator->preg;

  • trunk/psLib/src/collections/psMetadataIO.c

    r3980 r4029  
    1010*  @author Eric Van Alst, MHPCC
    1111*
    12 *  @version $Revision: 1.27 $ $Name: not supported by cvs2svn $
    13 *  @date $Date: 2005-05-19 20:48:28 $
     12*  @version $Revision: 1.28 $ $Name: not supported by cvs2svn $
     13*  @date $Date: 2005-05-25 20:26:55 $
    1414*
    1515*  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    368368    psBool success = true;
    369369
    370     PS_PTR_CHECK_NULL(fd, success);
    371     PS_PTR_CHECK_NULL(format, success);
    372     PS_PTR_CHECK_NULL(metadataItem, success);
     370    PS_ASSERT_PTR_NON_NULL(fd, success);
     371    PS_ASSERT_PTR_NON_NULL(format, success);
     372    PS_ASSERT_PTR_NON_NULL(metadataItem, success);
    373373
    374374    type = metadataItem->type;
    … …  
    469469    fitsfile *fd = NULL;
    470470
    471     PS_PTR_CHECK_NULL(fileName,NULL);
     471    PS_ASSERT_PTR_NON_NULL(fileName,NULL);
    472472
    473473    fits_open_file(&fd, fileName, READONLY, &status);
    … …  
    10861086
    10871087    // Check for NULL file name
    1088     PS_PTR_CHECK_NULL(fileName,NULL);
     1088    PS_ASSERT_PTR_NON_NULL(fileName,NULL);
    10891089
    10901090    // Check for NULL nFail
    1091     PS_PTR_CHECK_NULL(nFail,NULL);
     1091    PS_ASSERT_PTR_NON_NULL(nFail,NULL);
    10921092
    10931093    // Attempt to open specified file
    … …  
    11561156    // Get and check initial data pointers
    11571157    ctxt = (xmlParserCtxtPtr)ctx;
    1158     PS_PTR_CHECK_NULL_GENERAL(ctxt, return);
     1158    PS_ASSERT_GENERAL_PTR_NON_NULL(ctxt, return);
    11591159    md = (psMetadata*)ctxt->sax->_private;
    1160     PS_PTR_CHECK_NULL_GENERAL(md, return);
     1160    PS_ASSERT_GENERAL_PTR_NON_NULL(md, return);
    11611161    input = (xmlParserInputPtr)ctxt->input;
    1162     PS_PTR_CHECK_NULL_GENERAL(input, return);
     1162    PS_ASSERT_GENERAL_PTR_NON_NULL(input, return);
    11631163
    11641164    // Copy XML strings to psStrings to avoid libxml2/psLib memory corruption problems
    … …  
    11731173        psHashAdd(htAtts, "tagName", psTagName);
    11741174    } else {
    1175         PS_PTR_CHECK_NULL_GENERAL(psTagName, return);
     1175        PS_ASSERT_GENERAL_PTR_NON_NULL(psTagName, return);
    11761176        psFree(htAtts);
    11771177        psFree(psTagName);
    … …  
    11931193                psFree(psAttValue);
    11941194            } else {
    1195                 PS_PTR_CHECK_NULL_GENERAL(psAttValue, return);
     1195                PS_ASSERT_GENERAL_PTR_NON_NULL(psAttValue, return);
    11961196                psFree(htAtts);
    11971197                psFree(psTagName);
    … …  
    12371237    // Get and check initial data pointers
    12381238    ctxt = (xmlParserCtxtPtr)ctx;
    1239     PS_PTR_CHECK_NULL_GENERAL(ctxt, return);
     1239    PS_ASSERT_GENERAL_PTR_NON_NULL(ctxt, return);
    12401240    md = (psMetadata*)ctxt->sax->_private;
    1241     PS_PTR_CHECK_NULL_GENERAL(md, return);
     1241    PS_ASSERT_GENERAL_PTR_NON_NULL(md, return);
    12421242    input = (xmlParserInputPtr)ctxt->input;
    1243     PS_PTR_CHECK_NULL_GENERAL(input, return);
     1243    PS_ASSERT_GENERAL_PTR_NON_NULL(input, return);
    12441244    metadataItem = psMetadataLookup(md, "htAtts");
    1245     PS_PTR_CHECK_NULL_GENERAL(metadataItem, return);
    1246     PS_PTR_CHECK_NULL_GENERAL(metadataItem->data.list, return);
     1245    PS_ASSERT_GENERAL_PTR_NON_NULL(metadataItem, return);
     1246    PS_ASSERT_GENERAL_PTR_NON_NULL(metadataItem->data.list, return);
    12471247    metadataItem = (psMetadataItem*)psListGet(metadataItem->data.list,PS_LIST_TAIL);
    12481248    htAtts = (psHash*)metadataItem->data.list;
    1249     PS_PTR_CHECK_NULL_GENERAL(htAtts, return);
     1249    PS_ASSERT_GENERAL_PTR_NON_NULL(htAtts, return);
    12501250    fileName = (char*)input->filename;
    1251     PS_PTR_CHECK_NULL_GENERAL(fileName, return);
     1251    PS_ASSERT_GENERAL_PTR_NON_NULL(fileName, return);
    12521252    lineNumber = input->line;
    12531253
    … …  
    13861386    // Get and check initial data pointers
    13871387    ctxt = (xmlParserCtxtPtr)ctx;
    1388     PS_PTR_CHECK_NULL_GENERAL(ctxt, return);
     1388    PS_ASSERT_GENERAL_PTR_NON_NULL(ctxt, return);
    13891389    md = (psMetadata*)ctxt->sax->_private;
    1390     PS_PTR_CHECK_NULL_GENERAL(md, return);
     1390    PS_ASSERT_GENERAL_PTR_NON_NULL(md, return);
    13911391    input = (xmlParserInputPtr)ctxt->input;
    1392     PS_PTR_CHECK_NULL_GENERAL(input, return);
     1392    PS_ASSERT_GENERAL_PTR_NON_NULL(input, return);
    13931393    tables = psMetadataLookup(md, "htAtts");
    1394     PS_PTR_CHECK_NULL_GENERAL(tables, return);
    1395     PS_PTR_CHECK_NULL_GENERAL(tables->data.list, return);
     1394    PS_ASSERT_GENERAL_PTR_NON_NULL(tables, return);
     1395    PS_ASSERT_GENERAL_PTR_NON_NULL(tables->data.list, return);
    13961396    table = (psMetadataItem*)psListGet(tables->data.list,PS_LIST_TAIL);
    13971397    htAtts = (psHash*)table->data.list;
    1398     PS_PTR_CHECK_NULL_GENERAL(htAtts, return);
     1398    PS_ASSERT_GENERAL_PTR_NON_NULL(htAtts, return);
    13991399    fileName = (char*)input->filename;
    1400     PS_PTR_CHECK_NULL_GENERAL(fileName, return);
     1400    PS_ASSERT_GENERAL_PTR_NON_NULL(fileName, return);
    14011401    lineNumber = input->line;
    14021402
    … …  
    14271427
    14281428    strValue = psHashLookup(htAtts, "value");
    1429     PS_PTR_CHECK_NULL_GENERAL(strValue, return);
     1429    PS_ASSERT_GENERAL_PTR_NON_NULL(strValue, return);
    14301430
    14311431
    … …  
    14821482    // Get and check initial data pointers
    14831483    ctxt = (xmlParserCtxtPtr)ctx;
    1484     PS_PTR_CHECK_NULL_GENERAL(ctxt, return);
     1484    PS_ASSERT_GENERAL_PTR_NON_NULL(ctxt, return);
    14851485    md = (psMetadata*)ctxt->sax->_private;
    1486     PS_PTR_CHECK_NULL_GENERAL(md, return);
     1486    PS_ASSERT_GENERAL_PTR_NON_NULL(md, return);
    14871487    input = (xmlParserInputPtr)ctxt->input;
    1488     PS_PTR_CHECK_NULL_GENERAL(input, return);
     1488    PS_ASSERT_GENERAL_PTR_NON_NULL(input, return);
    14891489    tables = psMetadataLookup(md, "htAtts");
    1490     PS_PTR_CHECK_NULL_GENERAL(tables, return);
    1491     PS_PTR_CHECK_NULL_GENERAL(tables->data.list, return);
     1490    PS_ASSERT_GENERAL_PTR_NON_NULL(tables, return);
     1491    PS_ASSERT_GENERAL_PTR_NON_NULL(tables->data.list, return);
    14921492    table = (psMetadataItem*)psListGet(tables->data.list,PS_LIST_TAIL);
    14931493    htAtts = (psHash*)table->data.list;
    1494     PS_PTR_CHECK_NULL_GENERAL(htAtts, return);
     1494    PS_ASSERT_GENERAL_PTR_NON_NULL(htAtts, return);
    14951495
    14961496    // Copy XML strings to psStrings to avoid libxml2/psLib memory corruption problems
    … …  
    14991499    // Compare start and end tag names
    15001500    psStartTagName = psHashLookup(htAtts, "tagName");
    1501     PS_PTR_CHECK_NULL_GENERAL(psStartTagName, return);
     1501    PS_ASSERT_GENERAL_PTR_NON_NULL(psStartTagName, return);
    15021502    if(strcmp(psEndTagName, psStartTagName)) {
    15031503        psError(PS_ERR_IO, true, PS_ERRORTEXT_psMetadataIO_TAG_MISMATCH, psStartTagName, psEndTagName);
    … …  
    15271527
    15281528    // Error checks
    1529     PS_PTR_CHECK_NULL(fileName, NULL);
     1529    PS_ASSERT_PTR_NON_NULL(fileName, NULL);
    15301530
    15311531    // Allocate metadata if necessary
Note: See TracChangeset for help on using the changeset viewer.