Index: trunk/psLib/test/dataManip/tst_psFunc02.c
===================================================================
--- trunk/psLib/test/dataManip/tst_psFunc02.c	(revision 2250)
+++ trunk/psLib/test/dataManip/tst_psFunc02.c	(revision 2273)
@@ -64,5 +64,5 @@
     }
 
-    p_psSpline1DFree(tmpSpline);
+    psFree(tmpSpline);
     psMemCheckCorruption(1);
     memLeaks = psMemCheckLeaks(currentId,NULL,stderr);
@@ -90,5 +90,5 @@
     }
 
-    p_psSpline1DFree(tmpSpline);
+    psFree(tmpSpline);
     psMemCheckCorruption(1);
     memLeaks = psMemCheckLeaks(currentId,NULL,stderr);
@@ -144,5 +144,5 @@
     }
 
-    p_psSpline1DFree(tmpSpline);
+    psFree(tmpSpline);
     psMemCheckCorruption(1);
     memLeaks = psMemCheckLeaks(currentId,NULL,stderr);
@@ -198,5 +198,5 @@
     }
 
-    p_psSpline1DFree(tmpSpline);
+    psFree(tmpSpline);
     psMemCheckCorruption(1);
     memLeaks = psMemCheckLeaks(currentId,NULL,stderr);
@@ -224,5 +224,5 @@
     }
 
-    p_psSpline1DFree(tmpSpline);
+    psFree(tmpSpline);
     psMemCheckCorruption(1);
     memLeaks = psMemCheckLeaks(currentId,NULL,stderr);
@@ -278,5 +278,5 @@
     }
 
-    p_psSpline1DFree(tmpSpline);
+    psFree(tmpSpline);
     psMemCheckCorruption(1);
     memLeaks = psMemCheckLeaks(currentId,NULL,stderr);
Index: trunk/psLib/test/dataManip/tst_psFunc03.c
===================================================================
--- trunk/psLib/test/dataManip/tst_psFunc03.c	(revision 2250)
+++ trunk/psLib/test/dataManip/tst_psFunc03.c	(revision 2273)
@@ -72,5 +72,5 @@
     }
 
-    p_psSpline1DFree(tmpSpline);
+    psFree(tmpSpline);
     psFree(bounds);
     psMemCheckCorruption(1);
@@ -132,5 +132,5 @@
     }
 
-    p_psSpline1DFree(tmpSpline);
+    psFree(tmpSpline);
     psFree(bounds);
     psMemCheckCorruption(1);
Index: trunk/psLib/test/dataManip/tst_psFunc04.c
===================================================================
--- trunk/psLib/test/dataManip/tst_psFunc04.c	(revision 2250)
+++ trunk/psLib/test/dataManip/tst_psFunc04.c	(revision 2273)
@@ -53,5 +53,5 @@
     }
 
-    p_psSpline1DFree(tmpSpline);
+    psFree(tmpSpline);
     psMemCheckCorruption(1);
     psFree(data);
@@ -105,5 +105,5 @@
     }
 
-    p_psSpline1DFree(tmpSpline);
+    psFree(tmpSpline);
     psMemCheckCorruption(1);
     psFree(data);
Index: trunk/psLib/test/dataManip/tst_psFunc05.c
===================================================================
--- trunk/psLib/test/dataManip/tst_psFunc05.c	(revision 2250)
+++ trunk/psLib/test/dataManip/tst_psFunc05.c	(revision 2273)
@@ -59,5 +59,5 @@
     }
 
-    p_psSpline1DFree(tmpSpline);
+    psFree(tmpSpline);
 
     psFree(x);
Index: trunk/psLib/test/dataManip/tst_psFunc07.c
===================================================================
--- trunk/psLib/test/dataManip/tst_psFunc07.c	(revision 2250)
+++ trunk/psLib/test/dataManip/tst_psFunc07.c	(revision 2273)
@@ -83,5 +83,5 @@
     psFree(newX);
     psFree(y);
-    p_psSpline1DFree(tmpSpline);
+    psFree(tmpSpline);
     psFree(newY);
 
@@ -152,5 +152,5 @@
     psFree(newX);
     psFree(y);
-    p_psSpline1DFree(tmpSpline);
+    psFree(tmpSpline);
     psFree(newY);
 
Index: trunk/psLib/test/dataManip/tst_psMatrixVectorArithmetic02.c
===================================================================
--- trunk/psLib/test/dataManip/tst_psMatrixVectorArithmetic02.c	(revision 2250)
+++ trunk/psLib/test/dataManip/tst_psMatrixVectorArithmetic02.c	(revision 2273)
@@ -10,6 +10,6 @@
  *  @author  Ross Harman, MHPCC
  *
- *  @version $Revision: 1.7 $  $Name: not supported by cvs2svn $
- *  @date  $Date: 2004-10-27 00:57:33 $
+ *  @version $Revision: 1.8 $  $Name: not supported by cvs2svn $
+ *  @date  $Date: 2004-11-04 01:05:00 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -83,10 +83,10 @@
 #define CHECK_MEMORY \
 if( psMemCheckLeaks(0, NULL, stdout) != 0 ) {  \
-    psError(__func__,"Memory leaks detected."); \
+    psError(PS_ERR_UNKNOWN, true,"Memory leaks detected."); \
     return 50; \
 } \
 psS32 nBad = psMemCheckCorruption(0); \
 if(nBad) { \
-    psError(__func__,"ERROR: Found %d bad memory blocks\n", nBad); \
+    psError(PS_ERR_UNKNOWN, true,"ERROR: Found %d bad memory blocks\n", nBad); \
     return 51; \
 }
Index: trunk/psLib/test/dataManip/tst_psMatrixVectorArithmetic03.c
===================================================================
--- trunk/psLib/test/dataManip/tst_psMatrixVectorArithmetic03.c	(revision 2250)
+++ trunk/psLib/test/dataManip/tst_psMatrixVectorArithmetic03.c	(revision 2273)
@@ -15,6 +15,6 @@
  *  @author  Ross Harman, MHPCC
  *
- *  @version $Revision: 1.6 $  $Name: not supported by cvs2svn $
- *  @date  $Date: 2004-10-27 00:57:33 $
+ *  @version $Revision: 1.7 $  $Name: not supported by cvs2svn $
+ *  @date  $Date: 2004-11-04 01:05:00 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -221,5 +221,5 @@
     CREATE_AND_SET_VECTOR(vector6,F64,0,3);
     if ( psBinaryOp(vector6,vector4,"+",NULL) != NULL ) {
-        psError(__func__,"psBinaryOp should return null when out and in1 valid but in2 null.");
+        psError(PS_ERR_UNKNOWN, true,"psBinaryOp should return null when out and in1 valid but in2 null.");
         return 10;
     }
@@ -228,5 +228,5 @@
     vector4->type.dimen = PS_DIMEN_OTHER;
     if ( psBinaryOp(NULL,vector4,"+",vector5) != NULL) {
-        psError(__func__,"psBinaryOp should return null when input dimen PS_DIMEN_OTHER.");
+        psError(PS_ERR_UNKNOWN, true,"psBinaryOp should return null when input dimen PS_DIMEN_OTHER.");
         return 11;
     }
@@ -236,5 +236,5 @@
     CREATE_AND_SET_IMAGE(image10,F64,0,3,3);
     if ( psBinaryOp(image10,inScalar,"+",vector4) == NULL ) {
-        psError(__func__,"psBinaryOp should not return null when input/out dimension don't match.");
+        psError(PS_ERR_UNKNOWN, true,"psBinaryOp should not return null when input/out dimension don't match.");
         return 12;
     }
Index: trunk/psLib/test/dataManip/tst_psMinimize04.c
===================================================================
--- trunk/psLib/test/dataManip/tst_psMinimize04.c	(revision 2250)
+++ trunk/psLib/test/dataManip/tst_psMinimize04.c	(revision 2273)
@@ -237,5 +237,5 @@
     myPoly = psVectorFitPolynomial1D(NULL, NULL, NULL, NULL);
     if ( myPoly != NULL ) {
-        psError(__func__,"A null polynomial should have returned a null pointer.");
+        psError(PS_ERR_UNKNOWN, true,"A null polynomial should have returned a null pointer.");
         testStatus = false;
     }
Index: trunk/psLib/test/dataManip/tst_psMinimize04b.c
===================================================================
--- trunk/psLib/test/dataManip/tst_psMinimize04b.c	(revision 2250)
+++ trunk/psLib/test/dataManip/tst_psMinimize04b.c	(revision 2273)
@@ -47,5 +47,5 @@
         yErr->data.F64[i] = 1.0;
     }
-    p_psNormalizeVectorF64(x);
+    psNormalizeVectorRange(x,0.0,1.0);
 
     printPositiveTestHeader(stdout,
@@ -113,5 +113,5 @@
         y->data.F64[i] = setData(x->data.F64[i]);
     }
-    p_psNormalizeVectorF64(x);
+    psNormalizeVectorRange(x,0.0,1.0);
 
     printPositiveTestHeader(stdout,
@@ -173,5 +173,5 @@
         y->data.F64[i] = setData(x->data.F64[i]);
     }
-    p_psNormalizeVectorF64(x);
+    psNormalizeVectorRange(x,0.0,1.0);
 
     printPositiveTestHeader(stdout,
Index: trunk/psLib/test/dataManip/tst_psMinimize04b_F32.c
===================================================================
--- trunk/psLib/test/dataManip/tst_psMinimize04b_F32.c	(revision 2250)
+++ trunk/psLib/test/dataManip/tst_psMinimize04b_F32.c	(revision 2273)
@@ -47,5 +47,5 @@
         yErr->data.F32[i] = 1.0;
     }
-    p_psNormalizeVector(x);
+    psNormalizeVectorRange(x,0.0f,1.0f);
 
     printPositiveTestHeader(stdout,
@@ -113,5 +113,5 @@
         y->data.F32[i] = setData(x->data.F32[i]);
     }
-    p_psNormalizeVector(x);
+    psNormalizeVectorRange(x,0.0f,1.0f);
 
     printPositiveTestHeader(stdout,
@@ -173,5 +173,5 @@
         y->data.F32[i] = setData(x->data.F32[i]);
     }
-    p_psNormalizeVector(x);
+    psNormalizeVectorRange(x,0.0,1.0);
 
     printPositiveTestHeader(stdout,
Index: trunk/psLib/test/dataManip/tst_psMinimize06.c
===================================================================
--- trunk/psLib/test/dataManip/tst_psMinimize06.c	(revision 2250)
+++ trunk/psLib/test/dataManip/tst_psMinimize06.c	(revision 2273)
@@ -35,5 +35,5 @@
     if (myDeriv == NULL) {
         myDeriv = psImageAlloc(myParams->n, myCoords->n, PS_TYPE_F32);
-        psError(__func__, "myDeriv is NULL.\n");
+        psError(PS_ERR_UNKNOWN, true, "myDeriv is NULL.\n");
     }
 
Index: trunk/psLib/test/dataManip/tst_psVectorFFT.c
===================================================================
--- trunk/psLib/test/dataManip/tst_psVectorFFT.c	(revision 2250)
+++ trunk/psLib/test/dataManip/tst_psVectorFFT.c	(revision 2273)
@@ -6,6 +6,6 @@
 *  @author Robert DeSonia, MHPCC
 *
-*  @version $Revision: 1.7 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2004-10-27 00:57:33 $
+*  @version $Revision: 1.8 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2004-11-04 01:05:00 $
 *
 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -85,5 +85,5 @@
     vec2 = psVectorFFT( NULL, vec, PS_FFT_FORWARD );
     if ( vec2->type.type != PS_TYPE_C32 ) {
-        psError( __func__, "FFT didn't produce complex values?" );
+        psError(PS_ERR_UNKNOWN,true, "FFT didn't produce complex values?" );
         return 1;
     }
@@ -94,10 +94,10 @@
         if ( n == 1 || n == 99 ) {
             if ( fabsf( cabsf( vec2->data.C32[ n ] ) - 50.0f ) > 0.1f ) {
-                psError( __func__, "FFT didn't work for vector (n=%d)", n );
+                psError(PS_ERR_UNKNOWN,true, "FFT didn't work for vector (n=%d)", n );
                 return 2;
             }
         } else {
             if ( fabsf( cabsf( vec2->data.C32[ n ] ) ) > 0.1f ) {
-                psError( __func__, "FFT didn't work for vector (n=%d)", n );
+                psError(PS_ERR_UNKNOWN,true, "FFT didn't work for vector (n=%d)", n );
                 return 3;
             }
@@ -108,5 +108,5 @@
     vec3 = psVectorFFT( NULL, vec2, PS_FFT_REVERSE );
     if ( vec3->type.type != PS_TYPE_C32 ) {
-        psError( __func__, "FFT didn't produce complex values?" );
+        psError(PS_ERR_UNKNOWN,true, "FFT didn't produce complex values?" );
         return 4;
     }
@@ -115,6 +115,6 @@
         psF32 vecVal = crealf( vec3->data.C32[ n ] ) / 100;
         if ( fabsf( vecVal - val ) > 0.1f ) {
-            psError( __func__, "Reverse FFT didn't give me the original vector back (n=%d) (%.2f vs %.2f)",
-                     n, vecVal, val );
+            psError(PS_ERR_UNKNOWN,true, "Reverse FFT didn't give me the original vector back (n=%d) (%.2f vs %.2f)",
+                    n, vecVal, val );
             return 5;
         }
@@ -150,10 +150,10 @@
     vec2 = psVectorReal( vec2, vec );
     if ( vec2 == NULL ) {
-        psError( __func__, "psVectorReal returned a NULL?" );
+        psError(PS_ERR_UNKNOWN,true, "psVectorReal returned a NULL?" );
         return 1;
     }
     if ( vec2->type.type != PS_TYPE_F32 ) {
-        psError( __func__, "psVectorReal returned a wrong type (%d)?",
-                 vec2->type.type );
+        psError(PS_ERR_UNKNOWN,true, "psVectorReal returned a wrong type (%d)?",
+                vec2->type.type );
         return 2;
     }
@@ -161,10 +161,10 @@
     vec3 = psVectorImaginary( vec3, vec );
     if ( vec3 == NULL ) {
-        psError( __func__, "psVectorImaginary returned a NULL?" );
+        psError(PS_ERR_UNKNOWN,true, "psVectorImaginary returned a NULL?" );
         return 3;
     }
     if ( vec3->type.type != PS_TYPE_F32 ) {
-        psError( __func__, "psVectorImaginary returned a wrong type (%d)?",
-                 vec3->type.type );
+        psError(PS_ERR_UNKNOWN,true, "psVectorImaginary returned a wrong type (%d)?",
+                vec3->type.type );
         return 4;
     }
@@ -175,11 +175,11 @@
         psF32 i = ( n * 2 );
         if ( fabsf( vec2->data.F32[ n ] - r ) > FLT_EPSILON ) {
-            psError( __func__, "psVectorReal didn't return the real portion at n=%d",
-                     n );
+            psError(PS_ERR_UNKNOWN,true, "psVectorReal didn't return the real portion at n=%d",
+                    n );
             return 5;
         }
         if ( fabsf( vec3->data.F32[ n ] - i ) > FLT_EPSILON ) {
-            psError( __func__, "psVectorImaginary didn't return the real portion at n=%d",
-                     n );
+            psError(PS_ERR_UNKNOWN,true, "psVectorImaginary didn't return the real portion at n=%d",
+                    n );
             return 6;
         }
@@ -230,6 +230,6 @@
     // 3. verify that the result is a psC32
     if ( vec3->type.type != PS_TYPE_C32 ) {
-        psError( __func__, "Vector Type from psVectorComplex is not complex? (%d)",
-                 vec3->type.type );
+        psError(PS_ERR_UNKNOWN,true, "Vector Type from psVectorComplex is not complex? (%d)",
+                vec3->type.type );
         return 1;
     }
@@ -240,6 +240,6 @@
         if ( fabsf( crealf( vec3->data.C32[ n ] ) - n ) > FLT_EPSILON ||
                 fabsf( cimagf( vec3->data.C32[ n ] ) - ( n * 2 ) ) > FLT_EPSILON ) {
-            psError( __func__, "psVectorComplex result is invalid (n=%d, %.2f+%.2fi)",
-                     n, crealf( vec3->data.C32[ n ] ), cimagf( vec3->data.C32[ n ] ) );
+            psError(PS_ERR_UNKNOWN,true, "psVectorComplex result is invalid (n=%d, %.2f+%.2fi)",
+                    n, crealf( vec3->data.C32[ n ] ), cimagf( vec3->data.C32[ n ] ) );
             return 2;
         };
@@ -251,9 +251,9 @@
 
     // 7. call psVectorComplex
-    psLogMsg( __func__, PS_LOG_INFO, "Following should be an error (type mismatch)." );
+    psLogMsg(__func__, PS_LOG_INFO, "Following should be an error (type mismatch)." );
     vec3 = psVectorComplex( vec3, vec, vec2 );
     // 8. verify that an appropriate error occurred. (this partially has to be done via inspection)
     if ( vec3 != NULL ) {
-        psError( __func__, "psVectorComplex returned a vector though input types mismatched." );
+        psError(PS_ERR_UNKNOWN,true, "psVectorComplex returned a vector though input types mismatched." );
         return 3;
     }
@@ -267,5 +267,5 @@
     // 11. verify thet an appropriate error occurred. (actually, it isn't an error...)
     if ( vec3->n != 100 ) {
-        psError( __func__, "psVectorComplex returned a larger vector than the input supported (%d).", vec3->n );
+        psError(PS_ERR_UNKNOWN,true, "psVectorComplex returned a larger vector than the input supported (%d).", vec3->n );
         return 4;
     }
@@ -302,5 +302,5 @@
     // 3. verify result is psC32
     if ( vec2->type.type != PS_TYPE_C32 ) {
-        psError( __func__, "the psVectorConjugate didn't return a C32 vector" );
+        psError(PS_ERR_UNKNOWN,true, "the psVectorConjugate didn't return a C32 vector" );
         return 1;
     }
@@ -310,6 +310,6 @@
         if ( fabsf( crealf( vec->data.C32[ n ] ) - crealf( vec2->data.C32[ n ] ) ) > FLT_EPSILON ||
                 fabsf( cimagf( vec->data.C32[ n ] ) + cimagf( vec2->data.C32[ n ] ) ) > FLT_EPSILON ) {
-            psError( __func__, "psVectorComplex result is invalid (n=%d, %.2f+%.2fi)",
-                     n, crealf( vec2->data.C32[ n ] ), cimagf( vec2->data.C32[ n ] ) );
+            psError(PS_ERR_UNKNOWN,true, "psVectorComplex result is invalid (n=%d, %.2f+%.2fi)",
+                    n, crealf( vec2->data.C32[ n ] ), cimagf( vec2->data.C32[ n ] ) );
             return 2;
         };
@@ -347,5 +347,5 @@
     // 3. verify result is psF32
     if ( vec2->type.type != PS_TYPE_F32 ) {
-        psError( __func__, "the type was not PS_TYPE_F32." );
+        psError(PS_ERR_UNKNOWN,true, "the type was not PS_TYPE_F32." );
         return 1;
     }
@@ -360,6 +360,6 @@
     val = cabsf( vec->data.C32[ 0 ] ) * cabsf( vec->data.C32[ 0 ] ) / 100 / 100;
     if ( fabsf( vec2->data.F32[ 0 ] - val ) > FLT_EPSILON ) {
-        psError( __func__, "psVectorPowerSpectrum result is invalid (n=0, %.2f %.2f)",
-                 vec2->data.F32[ 0 ], val );
+        psError(PS_ERR_UNKNOWN,true, "psVectorPowerSpectrum result is invalid (n=0, %.2f %.2f)",
+                vec2->data.F32[ 0 ], val );
         return 2;
     };
@@ -370,6 +370,6 @@
 
         if ( fabsf( val - vec2->data.F32[ n ] ) > FLT_EPSILON ) {
-            psError( __func__, "psVectorPowerSpectrum result is invalid (n=%d, %.2f %.2f)",
-                     n, vec2->data.F32[ n ], val );
+            psError(PS_ERR_UNKNOWN,true, "psVectorPowerSpectrum result is invalid (n=%d, %.2f %.2f)",
+                    n, vec2->data.F32[ n ], val );
             return 2;
         };
@@ -378,6 +378,6 @@
     val = cabsf( vec->data.C32[ 50 ] ) * cabsf( vec->data.C32[ 50 ] ) / 100 / 100;
     if ( fabsf( vec2->data.F32[ 50 ] - val ) > FLT_EPSILON ) {
-        psError( __func__, "psVectorPowerSpectrum result is invalid (n=50, %.2f %.2f)",
-                 vec2->data.F32[ 0 ], val );
+        psError(PS_ERR_UNKNOWN,true, "psVectorPowerSpectrum result is invalid (n=50, %.2f %.2f)",
+                vec2->data.F32[ 0 ], val );
         return 2;
     };