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...

File:
1 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;
Note: See TracChangeset for help on using the changeset viewer.