Index: trunk/psLib/src/astronomy/psAstrometry.c
===================================================================
--- trunk/psLib/src/astronomy/psAstrometry.c	(revision 2204)
+++ trunk/psLib/src/astronomy/psAstrometry.c	(revision 2206)
@@ -8,6 +8,6 @@
  *  @author George Gusciora, MHPCC
  *
- *  @version $Revision: 1.43 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-10-27 00:57:30 $
+ *  @version $Revision: 1.44 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-10-27 01:15:47 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -58,6 +58,6 @@
 static psS32 isProjectionLinear(psPlaneTransform *transform)
 {
-    psS32 i = 0;
-    PS_CHECK_NULL_PTR_RETURN_ZERO(transform);
+    int i = 0;
+    PS_CHECK_NULL_PTR(transform, 0);
 
     for (i=2;i<(transform->x->nX);i++) {
@@ -114,5 +114,5 @@
     double F = transform->y->coeff[0][1];
 
-    PS_CHECK_NULL_PTR_RETURN_NULL(transform);
+    PS_CHECK_NULL_PTR(transform, NULL);
     psPlaneTransform *out = psAlloc(sizeof(psPlaneTransform));
 
@@ -286,5 +286,5 @@
                             const psObservatory* observatory)
 {
-    PS_CHECK_NULL_PTR_RETURN_NULL(observatory);
+    PS_CHECK_NULL_PTR(observatory, NULL);
     psExposure* exp = psAlloc(sizeof(psExposure));
 
@@ -463,5 +463,5 @@
 psGrommit* psGrommitAlloc(const psExposure* exp)
 {
-    PS_CHECK_NULL_PTR_RETURN_NULL(exp);
+    PS_CHECK_NULL_PTR(exp, NULL);
 
     double date = psTimeToMJD(exp->time);
@@ -493,6 +493,6 @@
                     const psFPA* FPA)
 {
-    PS_CHECK_NULL_PTR_RETURN_NULL(fpaCoord);
-    PS_CHECK_NULL_PTR_RETURN_NULL(FPA);
+    PS_CHECK_NULL_PTR(fpaCoord, NULL);
+    PS_CHECK_NULL_PTR(FPA, NULL);
     psChip* tmpChip = NULL;
     psPlane chipCoord;
@@ -517,7 +517,7 @@
                     const psFPA* FPA)
 {
-    PS_CHECK_NULL_PTR_RETURN_NULL(fpaCoord);
-    PS_CHECK_NULL_PTR_RETURN_NULL(FPA);
-    PS_CHECK_NULL_PTR_RETURN_NULL(FPA->chips);
+    PS_CHECK_NULL_PTR(fpaCoord, NULL);
+    PS_CHECK_NULL_PTR(FPA, NULL);
+    PS_CHECK_NULL_PTR(FPA->chips, NULL);
     psArray* chips = FPA->chips;
     psS32 nChips = chips->n;
@@ -545,6 +545,6 @@
                      const psChip* chip)
 {
-    PS_CHECK_NULL_PTR_RETURN_NULL(chipCoord);
-    PS_CHECK_NULL_PTR_RETURN_NULL(chip);
+    PS_CHECK_NULL_PTR(chipCoord, NULL);
+    PS_CHECK_NULL_PTR(chip, NULL);
 
     psPlane cellCoord;
@@ -588,6 +588,6 @@
                            const psCell* cell)
 {
-    PS_CHECK_NULL_PTR_RETURN_NULL(inCoord);
-    PS_CHECK_NULL_PTR_RETURN_NULL(cell);
+    PS_CHECK_NULL_PTR(inCoord, NULL);
+    PS_CHECK_NULL_PTR(cell, NULL);
 
     return (psPlaneTransformApply(outCoord, cell->toChip, inCoord));
@@ -598,6 +598,6 @@
                           const psChip* chip)
 {
-    PS_CHECK_NULL_PTR_RETURN_NULL(inCoord);
-    PS_CHECK_NULL_PTR_RETURN_NULL(chip);
+    PS_CHECK_NULL_PTR(inCoord, NULL);
+    PS_CHECK_NULL_PTR(chip, NULL);
 
     return (psPlaneTransformApply(outCoord, chip->toFPA, inCoord));
@@ -610,6 +610,6 @@
                         const psFPA* fpa)
 {
-    PS_CHECK_NULL_PTR_RETURN_NULL(inCoord);
-    PS_CHECK_NULL_PTR_RETURN_NULL(fpa);
+    PS_CHECK_NULL_PTR(inCoord, NULL);
+    PS_CHECK_NULL_PTR(fpa, NULL);
 
     return(psPlaneDistortApply(outCoord, fpa->toTangentPlane, inCoord,
@@ -624,6 +624,6 @@
                          const psGrommit* grommit)
 {
-    PS_CHECK_NULL_PTR_RETURN_NULL(tpCoord);
-    PS_CHECK_NULL_PTR_RETURN_NULL(grommit);
+    PS_CHECK_NULL_PTR(tpCoord, NULL);
+    PS_CHECK_NULL_PTR(grommit, NULL);
 
     double AOB = 0.0;
@@ -644,6 +644,6 @@
                           const psCell* cell)
 {
-    PS_CHECK_NULL_PTR_RETURN_NULL(cellCoord);
-    PS_CHECK_NULL_PTR_RETURN_NULL(cell);
+    PS_CHECK_NULL_PTR(cellCoord, NULL);
+    PS_CHECK_NULL_PTR(cell, NULL);
 
     return (psPlaneTransformApply(fpaCoord, cell->toFPA, cellCoord));
@@ -656,6 +656,6 @@
                            const psCell* cell)
 {
-    PS_CHECK_NULL_PTR_RETURN_NULL(cellCoord);
-    PS_CHECK_NULL_PTR_RETURN_NULL(cell);
+    PS_CHECK_NULL_PTR(cellCoord, NULL);
+    PS_CHECK_NULL_PTR(cell, NULL);
 
     psPlane* fpaCoord = NULL;
@@ -688,6 +688,6 @@
                                 const psCell* cell)
 {
-    PS_CHECK_NULL_PTR_RETURN_NULL(cellCoord);
-    PS_CHECK_NULL_PTR_RETURN_NULL(cell);
+    PS_CHECK_NULL_PTR(cellCoord, NULL);
+    PS_CHECK_NULL_PTR(cell, NULL);
 
     psPlane *tpCoord = NULL;
@@ -724,6 +724,6 @@
                         const psGrommit* grommit)
 {
-    PS_CHECK_NULL_PTR_RETURN_NULL(in);
-    PS_CHECK_NULL_PTR_RETURN_NULL(grommit);
+    PS_CHECK_NULL_PTR(in, NULL);
+    PS_CHECK_NULL_PTR(grommit, NULL);
 
     char* type = "RA";
@@ -745,6 +745,6 @@
                         const psFPA* fpa)
 {
-    PS_CHECK_NULL_PTR_RETURN_NULL(tpCoord);
-    PS_CHECK_NULL_PTR_RETURN_NULL(fpa);
+    PS_CHECK_NULL_PTR(tpCoord, NULL);
+    PS_CHECK_NULL_PTR(fpa, NULL);
 
     return (psPlaneDistortApply(fpaCoord, fpa->fromTangentPlane,
@@ -756,7 +756,7 @@
                           const psChip* chip)
 {
-    PS_CHECK_NULL_PTR_RETURN_NULL(fpaCoord);
-    PS_CHECK_NULL_PTR_RETURN_NULL(chip);
-    PS_CHECK_NULL_PTR_RETURN_NULL(chip->parent);
+    PS_CHECK_NULL_PTR(fpaCoord, NULL);
+    PS_CHECK_NULL_PTR(chip, NULL);
+    PS_CHECK_NULL_PTR(chip->parent, NULL);
 
     chipCoord = psPlaneTransformApply(chipCoord, chip->fromFPA, fpaCoord);
@@ -768,7 +768,7 @@
                            const psCell* cell)
 {
-    PS_CHECK_NULL_PTR_RETURN_NULL(chipCoord);
-    PS_CHECK_NULL_PTR_RETURN_NULL(cell);
-    PS_CHECK_NULL_PTR_RETURN_NULL(cell->parent);
+    PS_CHECK_NULL_PTR(chipCoord, NULL);
+    PS_CHECK_NULL_PTR(cell, NULL);
+    PS_CHECK_NULL_PTR(cell->parent, NULL);
 
     cellCoord = psPlaneTransformApply(cellCoord, cell->fromChip, chipCoord);
@@ -782,6 +782,6 @@
                           const psCell* cell)
 {
-    PS_CHECK_NULL_PTR_RETURN_NULL(skyCoord);
-    PS_CHECK_NULL_PTR_RETURN_NULL(cell);
+    PS_CHECK_NULL_PTR(skyCoord, NULL);
+    PS_CHECK_NULL_PTR(cell, NULL);
 
     psChip *parChip = cell->parent;
@@ -813,6 +813,6 @@
                                const psCell* cell)
 {
-    PS_CHECK_NULL_PTR_RETURN_NULL(skyCoord);
-    PS_CHECK_NULL_PTR_RETURN_NULL(cell);
+    PS_CHECK_NULL_PTR(skyCoord, NULL);
+    PS_CHECK_NULL_PTR(cell, NULL);
 
     psPlane *tpCoord = NULL;
Index: trunk/psLib/src/astronomy/psCoord.c
===================================================================
--- trunk/psLib/src/astronomy/psCoord.c	(revision 2204)
+++ trunk/psLib/src/astronomy/psCoord.c	(revision 2206)
@@ -10,6 +10,6 @@
 *  @author George Gusciora, MHPCC
 *
-*  @version $Revision: 1.29 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2004-10-27 00:57:30 $
+*  @version $Revision: 1.30 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2004-10-27 01:15:47 $
 *
 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -81,6 +81,6 @@
                                const psPlane* coords)
 {
-    PS_CHECK_NULL_PTR_RETURN_NULL(transform);
-    PS_CHECK_NULL_PTR_RETURN_NULL(coords);
+    PS_CHECK_NULL_PTR(transform, NULL);
+    PS_CHECK_NULL_PTR(coords, NULL);
     if (out == NULL) {
         out = (psPlane* ) psAlloc(sizeof(psPlane));
@@ -117,6 +117,6 @@
                              float magnitude)
 {
-    PS_CHECK_NULL_PTR_RETURN_NULL(transform);
-    PS_CHECK_NULL_PTR_RETURN_NULL(coords);
+    PS_CHECK_NULL_PTR(transform, NULL);
+    PS_CHECK_NULL_PTR(coords, NULL);
     if (out == NULL) {
         out = (psPlane* ) psAlloc(sizeof(psPlane));
@@ -156,6 +156,6 @@
                                  const psSphere* coord)
 {
-    PS_CHECK_NULL_PTR_RETURN_NULL(transform);
-    PS_CHECK_NULL_PTR_RETURN_NULL(coord);
+    PS_CHECK_NULL_PTR(transform, NULL);
+    PS_CHECK_NULL_PTR(coord, NULL);
     double sinY = 0.0;
     double cosY = 0.0;
@@ -228,6 +228,6 @@
                    const psProjection* projection)
 {
-    PS_CHECK_NULL_PTR_RETURN_NULL(coord);
-    PS_CHECK_NULL_PTR_RETURN_NULL(projection);
+    PS_CHECK_NULL_PTR(coord, NULL);
+    PS_CHECK_NULL_PTR(projection, NULL);
 
     float R = 0.0;
@@ -280,6 +280,6 @@
                       const psProjection* projection)
 {
-    PS_CHECK_NULL_PTR_RETURN_NULL(coord);
-    PS_CHECK_NULL_PTR_RETURN_NULL(projection);
+    PS_CHECK_NULL_PTR(coord, NULL);
+    PS_CHECK_NULL_PTR(projection, NULL);
 
     float R = 0.0;
@@ -348,6 +348,6 @@
                             psSphereOffsetUnit unit)
 {
-    PS_CHECK_NULL_PTR_RETURN_NULL(position1);
-    PS_CHECK_NULL_PTR_RETURN_NULL(position2);
+    PS_CHECK_NULL_PTR(position1, NULL);
+    PS_CHECK_NULL_PTR(position2, NULL);
 
     psPlane* lin;
@@ -416,6 +416,6 @@
                             psSphereOffsetUnit unit)
 {
-    PS_CHECK_NULL_PTR_RETURN_NULL(position);
-    PS_CHECK_NULL_PTR_RETURN_NULL(offset);
+    PS_CHECK_NULL_PTR(position, NULL);
+    PS_CHECK_NULL_PTR(offset, NULL);
 
     psPlane lin;