IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Ignore:
Timestamp:
Jun 1, 2006, 2:55:23 PM (20 years ago)
Author:
Paul Price
Message:

Addition of a vast quantity of assertions in public functions. Adopted a policy of using assert() within file-static functions (since they are only called internally, any errors there are problems with the program) and using the PS_ASSERT_WHATEVER() macros within public functions. Cleaned a few things up in the process.

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/psModules/src/camera/pmFPAview.c

    r7017 r7278  
    33 *  @author EAM, IfA
    44 *
    5  *  @version $Revision: 1.1 $ $Name: not supported by cvs2svn $
    6  *  @date $Date: 2006-05-01 01:55:43 $
     5 *  @version $Revision: 1.2 $ $Name: not supported by cvs2svn $
     6 *  @date $Date: 2006-06-02 00:55:22 $
    77 *
    88 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
    … …  
    1919#include "pmFPAview.h"
    2020
    21 static void pmFPAviewFree (pmFPAview *view)
    22 {
    23     if (view == NULL)
    24         return;
     21static void pmFPAviewFree(pmFPAview *view)
     22{
     23    // No reason to keep this function, apart from the fact that it allows us to type the memBlock
    2524    return;
    2625}
    2726
    28 pmFPAview *pmFPAviewAlloc (int nRows)
    29 {
    30     pmFPAview *view = psAlloc (sizeof(pmFPAview));
    31     psMemSetDeallocator (view, (psFreeFunc) pmFPAviewFree);
     27pmFPAview *pmFPAviewAlloc(int nRows)
     28{
     29    pmFPAview *view = psAlloc(sizeof(pmFPAview));
     30    psMemSetDeallocator(view, (psFreeFunc) pmFPAviewFree);
    3231
    3332    view->chip    = -1;
    … …  
    3635    view->iRows   =  0;
    3736    view->nRows   = nRows;
    38     return (view);
    39 }
    40 
    41 pmFPAdepth pmFPAviewDepth (const pmFPAview *view)
    42 {
     37    return view;
     38}
     39
     40pmFPAdepth pmFPAviewDepth(const pmFPAview *view)
     41{
     42    PS_ASSERT_PTR_NON_NULL(view, PM_FPA_DEPTH_NONE);
    4343
    4444    if (view->chip < 0) {
    … …  
    5454}
    5555
    56 pmChip *pmFPAviewThisChip (const pmFPAview *view, pmFPA *fpa)
    57 {
     56pmChip *pmFPAviewThisChip(const pmFPAview *view, pmFPA *fpa)
     57{
     58    PS_ASSERT_PTR_NON_NULL(view, NULL);
     59    PS_ASSERT_PTR_NON_NULL(fpa, NULL);
    5860
    5961    if (view->chip < 0) {
    … …  
    6971}
    7072
    71 pmChip *pmFPAviewNextChip (pmFPAview *view, pmFPA *fpa, int nStep)
    72 {
     73pmChip *pmFPAviewNextChip(pmFPAview *view, pmFPA *fpa, int nStep)
     74{
     75    PS_ASSERT_PTR_NON_NULL(view, NULL);
     76    PS_ASSERT_PTR_NON_NULL(fpa, NULL);
     77
    7378    view->cell = -1;
    7479    view->readout = -1;
    … …  
    100105}
    101106
    102 pmCell *pmFPAviewThisCell (const pmFPAview *view, pmFPA *fpa)
    103 {
     107pmCell *pmFPAviewThisCell(const pmFPAview *view, pmFPA *fpa)
     108{
     109    PS_ASSERT_PTR_NON_NULL(view, NULL);
     110    PS_ASSERT_PTR_NON_NULL(fpa, NULL);
    104111
    105112    if (view->cell < 0) {
    … …  
    108115
    109116    pmChip *chip = pmFPAviewThisChip (view, fpa);
    110     if (chip == NULL) {
    111         return NULL;
    112     }
     117    PS_ASSERT_PTR_NON_NULL(chip, NULL);
    113118
    114119    if (view->cell >= chip->cells->n) {
    … …  
    122127pmCell *pmFPAviewNextCell (pmFPAview *view, pmFPA *fpa, int nStep)
    123128{
     129    PS_ASSERT_PTR_NON_NULL(view, NULL);
     130    PS_ASSERT_PTR_NON_NULL(fpa, NULL);
    124131
    125132    pmChip *chip = pmFPAviewThisChip (view, fpa);
    126     if (chip == NULL) {
    127         return NULL;
    128     }
     133    PS_ASSERT_PTR_NON_NULL(chip, NULL);
    129134
    130135    view->readout = -1;
    … …  
    158163pmReadout *pmFPAviewThisReadout (const pmFPAview *view, pmFPA *fpa)
    159164{
     165    PS_ASSERT_PTR_NON_NULL(view, NULL);
     166    PS_ASSERT_PTR_NON_NULL(fpa, NULL);
    160167
    161168    if (view->readout < 0) {
    … …  
    164171
    165172    pmCell *cell = pmFPAviewThisCell (view, fpa);
    166     if (cell == NULL) {
    167         return NULL;
    168     }
     173    PS_ASSERT_PTR_NON_NULL(cell, NULL);
    169174
    170175    if (view->readout >= cell->readouts->n) {
    … …  
    178183pmReadout *pmFPAviewNextReadout (pmFPAview *view, pmFPA *fpa, int nStep)
    179184{
     185    PS_ASSERT_PTR_NON_NULL(view, NULL);
     186    PS_ASSERT_PTR_NON_NULL(fpa, NULL);
    180187
    181188    pmCell *cell = pmFPAviewThisCell (view, fpa);
    182     if (cell == NULL) {
    183         return NULL;
    184     }
     189    PS_ASSERT_PTR_NON_NULL(cell, NULL);
    185190
    186191    view->iRows = 0;
    … …  
    211216}
    212217
    213 pmHDU *pmFPAviewThisHDU (const pmFPAview *view, pmFPA *fpa)
    214 {
     218pmHDU *pmFPAviewThisHDU(const pmFPAview *view, pmFPA *fpa)
     219{
     220    PS_ASSERT_PTR_NON_NULL(view, NULL);
     221    PS_ASSERT_PTR_NON_NULL(fpa, NULL);
     222
    215223    // the HDU is attached to a cell, chip or fpa
    216224    // if this view has a -1 for the level which contains the hdu,
    … …  
    229237}
    230238
    231 pmHDU *pmFPAviewThisPHU (const pmFPAview *view, pmFPA *fpa)
    232 {
     239pmHDU *pmFPAviewThisPHU(const pmFPAview *view, pmFPA *fpa)
     240{
     241    PS_ASSERT_PTR_NON_NULL(view, NULL);
     242    PS_ASSERT_PTR_NON_NULL(fpa, NULL);
     243
    233244    // select the HDU which corresponds to the PHU containing this view
    234245
Note: See TracChangeset for help on using the changeset viewer.