IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 4031


Ignore:
Timestamp:
May 25, 2005, 12:46:47 PM (21 years ago)
Author:
gusciora
Message:

New ASSERT macros.

Location:
trunk/psLib/src
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • trunk/psLib/src/dataIO/psLookupTable.c

    r3684 r4031  
    77*  @author Ross Harman, MHPCC
    88*
    9 *  @version $Revision: 1.13 $ $Name: not supported by cvs2svn $
    10 *  @date $Date: 2005-04-08 17:58:57 $
     9*  @version $Revision: 1.14 $ $Name: not supported by cvs2svn $
     10*  @date $Date: 2005-05-25 22:46:47 $
    1111*
    1212*  Copyright 2004-5 Maui High Performance Computing Center, University of Hawaii
    … …  
    415415
    416416    // Can't read table if you don't know its name
    417     PS_PTR_CHECK_NULL(fileName,NULL);
     417    PS_ASSERT_PTR_NON_NULL(fileName,NULL);
    418418
    419419    // Allocate lookup table
    … …  
    549549
    550550    // Check for NULL input table
    551     PS_PTR_CHECK_NULL(table,NULL);
     551    PS_ASSERT_PTR_NON_NULL(table,NULL);
    552552
    553553    // Check for input table with NULL file name
    554     PS_PTR_CHECK_NULL(table->fileName,NULL);
     554    PS_ASSERT_PTR_NON_NULL(table->fileName,NULL);
    555555
    556556    // Open table file specified by table->fileName
    … …  
    869869    // Error checks
    870870    // Set status to error prior to check since if checks fails it will immediately return
    871     PS_PTR_CHECK_NULL(status,NAN);
     871    PS_ASSERT_PTR_NON_NULL(status,NAN);
    872872    *status = PS_LOOKUP_ERROR;
    873     PS_PTR_CHECK_NULL(table,NAN);
     873    PS_ASSERT_PTR_NON_NULL(table,NAN);
    874874    indexVec = table->index;
    875875    values = table->values;
    876876    numRows = table->numRows;
    877877    numCols = table->numCols;
    878     PS_PTR_CHECK_NULL(indexVec,NAN);
    879     PS_PTR_CHECK_NULL(values,NAN);
    880     PS_INT_CHECK_EQUALS(numRows, 0,NAN);
    881     PS_INT_CHECK_EQUALS(numCols, 0,NAN);
    882     PS_INT_CHECK_RANGE(column, 0, (int)(numCols-1), NAN);
     878    PS_ASSERT_PTR_NON_NULL(indexVec,NAN);
     879    PS_ASSERT_PTR_NON_NULL(values,NAN);
     880    PS_ASSERT_INT_UNEQUAL(numRows, 0,NAN);
     881    PS_ASSERT_INT_UNEQUAL(numCols, 0,NAN);
     882    PS_ASSERT_INT_WITHIN_RANGE(column, 0, (int)(numCols-1), NAN);
    883883
    884884    valuesVec = (psVector*)values->data[column];
    885     PS_PTR_CHECK_NULL(indexVec,NAN);
     885    PS_ASSERT_PTR_NON_NULL(indexVec,NAN);
    886886
    887887    // Set status to success since it passed all parameter checks
    … …  
    942942
    943943    // Error checks
    944     PS_PTR_CHECK_NULL(table,NULL);
    945     PS_PTR_CHECK_NULL(stats,NULL);
     944    PS_ASSERT_PTR_NON_NULL(table,NULL);
     945    PS_ASSERT_PTR_NON_NULL(stats,NULL);
    946946    numCols = table->numCols;
    947     PS_INT_CHECK_EQUALS(numCols, 0,NULL);
     947    PS_ASSERT_INT_UNEQUAL(numCols, 0,NULL);
    948948
    949949    outVector = psVectorAlloc(numCols+1, PS_TYPE_F64);

  • trunk/psLib/src/types/psLookupTable.c

    r3684 r4031  
    77*  @author Ross Harman, MHPCC
    88*
    9 *  @version $Revision: 1.13 $ $Name: not supported by cvs2svn $
    10 *  @date $Date: 2005-04-08 17:58:57 $
     9*  @version $Revision: 1.14 $ $Name: not supported by cvs2svn $
     10*  @date $Date: 2005-05-25 22:46:47 $
    1111*
    1212*  Copyright 2004-5 Maui High Performance Computing Center, University of Hawaii
    … …  
    415415
    416416    // Can't read table if you don't know its name
    417     PS_PTR_CHECK_NULL(fileName,NULL);
     417    PS_ASSERT_PTR_NON_NULL(fileName,NULL);
    418418
    419419    // Allocate lookup table
    … …  
    549549
    550550    // Check for NULL input table
    551     PS_PTR_CHECK_NULL(table,NULL);
     551    PS_ASSERT_PTR_NON_NULL(table,NULL);
    552552
    553553    // Check for input table with NULL file name
    554     PS_PTR_CHECK_NULL(table->fileName,NULL);
     554    PS_ASSERT_PTR_NON_NULL(table->fileName,NULL);
    555555
    556556    // Open table file specified by table->fileName
    … …  
    869869    // Error checks
    870870    // Set status to error prior to check since if checks fails it will immediately return
    871     PS_PTR_CHECK_NULL(status,NAN);
     871    PS_ASSERT_PTR_NON_NULL(status,NAN);
    872872    *status = PS_LOOKUP_ERROR;
    873     PS_PTR_CHECK_NULL(table,NAN);
     873    PS_ASSERT_PTR_NON_NULL(table,NAN);
    874874    indexVec = table->index;
    875875    values = table->values;
    876876    numRows = table->numRows;
    877877    numCols = table->numCols;
    878     PS_PTR_CHECK_NULL(indexVec,NAN);
    879     PS_PTR_CHECK_NULL(values,NAN);
    880     PS_INT_CHECK_EQUALS(numRows, 0,NAN);
    881     PS_INT_CHECK_EQUALS(numCols, 0,NAN);
    882     PS_INT_CHECK_RANGE(column, 0, (int)(numCols-1), NAN);
     878    PS_ASSERT_PTR_NON_NULL(indexVec,NAN);
     879    PS_ASSERT_PTR_NON_NULL(values,NAN);
     880    PS_ASSERT_INT_UNEQUAL(numRows, 0,NAN);
     881    PS_ASSERT_INT_UNEQUAL(numCols, 0,NAN);
     882    PS_ASSERT_INT_WITHIN_RANGE(column, 0, (int)(numCols-1), NAN);
    883883
    884884    valuesVec = (psVector*)values->data[column];
    885     PS_PTR_CHECK_NULL(indexVec,NAN);
     885    PS_ASSERT_PTR_NON_NULL(indexVec,NAN);
    886886
    887887    // Set status to success since it passed all parameter checks
    … …  
    942942
    943943    // Error checks
    944     PS_PTR_CHECK_NULL(table,NULL);
    945     PS_PTR_CHECK_NULL(stats,NULL);
     944    PS_ASSERT_PTR_NON_NULL(table,NULL);
     945    PS_ASSERT_PTR_NON_NULL(stats,NULL);
    946946    numCols = table->numCols;
    947     PS_INT_CHECK_EQUALS(numCols, 0,NULL);
     947    PS_ASSERT_INT_UNEQUAL(numCols, 0,NULL);
    948948
    949949    outVector = psVectorAlloc(numCols+1, PS_TYPE_F64);
Note: See TracChangeset for help on using the changeset viewer.