Index: trunk/psLib/src/math/psMinimize.c
===================================================================
--- trunk/psLib/src/math/psMinimize.c	(revision 2204)
+++ trunk/psLib/src/math/psMinimize.c	(revision 2206)
@@ -7,8 +7,8 @@
  *  fit a 1-D polynomial to a set of data points.
  *
- *  @author GLF, MHPCC
+ *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.61 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-10-27 00:57:31 $
+ *  @version $Revision: 1.62 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-10-27 01:15:47 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -252,6 +252,6 @@
     static psVector *yErr32Static = NULL;
 
-    PS_CHECK_NULL_PTR_RETURN_NULL(mySpline);
-    PS_CHECK_NULL_PTR_RETURN_NULL(y);
+    PS_CHECK_NULL_PTR(mySpline, NULL);
+    PS_CHECK_NULL_PTR(y, NULL);
     VECTOR_CHECK_TYPE_F32_OR_F64_RETURN_NULL(y);
     CONVERT_VECTOR_F64_TO_F32(y, y32, y32Static);
@@ -425,9 +425,9 @@
                         psMinimizeLMChi2Func func)
 {
-    PS_CHECK_NULL_PTR_RETURN_NULL(min);
-    PS_CHECK_NULL_VECTOR_RETURN_NULL(params);
+    PS_CHECK_NULL_PTR(min, NULL);
+    PS_CHECK_NULL_VECTOR(params, NULL);
     PS_CHECK_EMPTY_VECTOR_RETURN_NULL(params);
-    PS_CHECK_NULL_PTR_RETURN_NULL(x);
-    PS_CHECK_NULL_VECTOR_RETURN_NULL(y);
+    PS_CHECK_NULL_PTR(x, NULL);
+    PS_CHECK_NULL_VECTOR(y, NULL);
     PS_CHECK_EMPTY_VECTOR_RETURN_NULL(y);
     PS_CHECK_VECTOR_SIZE_EQUAL_RETURN_NULL(x, y);
@@ -856,5 +856,5 @@
     psPolynomial1D *tmpPoly;
     PS_CHECK_NULL_1DPOLY_RETURN_NULL(myPoly);
-    PS_CHECK_NULL_VECTOR_RETURN_NULL(y);
+    PS_CHECK_NULL_VECTOR(y, NULL);
     PS_CHECK_EMPTY_VECTOR_RETURN_NULL(y);
     psVector *x64 = NULL;
@@ -1319,9 +1319,9 @@
                         psMinimizePowellFunc func)
 {
-    PS_CHECK_NULL_VECTOR_RETURN_NULL(params);
+    PS_CHECK_NULL_VECTOR(params, NULL);
     PS_CHECK_EMPTY_VECTOR_RETURN_NULL(params);
-    PS_CHECK_NULL_PTR_RETURN_NULL(min);
-    PS_CHECK_NULL_PTR_RETURN_NULL(coords);
-    PS_CHECK_NULL_PTR_RETURN_NULL(func);
+    PS_CHECK_NULL_PTR(min, NULL);
+    PS_CHECK_NULL_PTR(coords, NULL);
+    PS_CHECK_NULL_PTR(func, NULL);
 
     psS32 numDims = params->n;