Changeset 11686

Timestamp:

Feb 7, 2007, 1:52:54 PM (19 years ago)

Author:

jhoblitt

Message:

update psAbort() API:

add noreturn attribute
remove unneeded 'name' params
turn into a macro so file/line/func are automatiically passed

Location:

trunk/psLib

Files:

• src/astro/psCoord.c (modified) (10 diffs)
• src/db/psDB.c (modified) (3 diffs)
• src/fits/psFitsTable.c (modified) (3 diffs)
• src/imageops/psImageGeomManip.c (modified) (2 diffs)
• src/math/psMinimizeLMM.c (modified) (2 diffs)
• src/math/psSparse.c (modified) (1 diff)
• src/math/psStats.c (modified) (5 diffs)
• src/sys/psAbort.c (modified) (3 diffs)
• src/sys/psAbort.h (modified) (3 diffs)
• src/sys/psError.c (modified) (4 diffs)
• src/sys/psString.c (modified) (2 diffs)
• src/types/psArguments.c (modified) (3 diffs)
• src/types/psMetadataItemCompare.c (modified) (1 diff)
• src/types/psMetadataItemParse.c (modified) (1 diff)
• test/imageops/tst_psImageStats.c (modified) (1 diff)
• test/math/tap_psPolyFit1D.c (modified) (1 diff)
• test/math/tap_psPolyFit2D.c (modified) (1 diff)
• test/math/tap_psPolyFit3D.c (modified) (1 diff)
• test/math/tap_psPolyFit4D.c (modified) (1 diff)
• test/math/tap_psStats07.c (modified) (1 diff)
• test/math/tap_psStats09.c (modified) (1 diff)
• test/math/tst_psFunc01.c (modified) (3 diffs)
• test/math/tst_psHist00.c (modified) (1 diff)
• test/math/tst_psHist01.c (modified) (1 diff)
• test/math/tst_psHist02.c (modified) (1 diff)
• test/math/tst_psHist03.c (modified) (1 diff)
• test/math/tst_psMathUtils.c (modified) (1 diff)
• test/math/tst_psMinimizeLMM.c (modified) (1 diff)
• test/math/tst_psMinimizePowell.c (modified) (3 diffs)
• test/math/tst_psPolyFit1D.c (modified) (1 diff)
• test/math/tst_psPolyFit2D.c (modified) (1 diff)
• test/math/tst_psPolyFit3D.c (modified) (1 diff)
• test/math/tst_psPolyFit4D.c (modified) (1 diff)
• test/math/tst_psSpline1D.c (modified) (10 diffs)
• test/math/tst_psStats03.c (modified) (1 diff)
• test/math/tst_psStats05.c (modified) (1 diff)
• test/math/tst_psStats06.c (modified) (1 diff)
• test/math/tst_psStats07.c (modified) (1 diff)
• test/math/tst_psStats08.c (modified) (1 diff)
• test/math/tst_psStats09.c (modified) (1 diff)
• test/types/tst_psBitSet.c (modified) (36 diffs)
• test/types/tst_psHash00.c (modified) (1 diff)
• test/types/tst_psHash01.c (modified) (1 diff)
• test/types/tst_psHash02.c (modified) (1 diff)
• test/types/tst_psHash03.c (modified) (1 diff)
• test/types/tst_psHash04.c (modified) (1 diff)

trunk/psLib/src/astro/psCoord.c

@@ -10 +10 @@
 *  @author GLG, MHPCC
 *
-*  @version $Revision: 1.133 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2007-02-06 21:36:09 $
+*  @version $Revision: 1.134 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2007-02-07 23:52:53 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -401 +401 @@
 
     default:
-        psAbort ("psCoord", "invalid projection");
+        psAbort("invalid projection");
         break;
     }
@@ -465 +465 @@
             break;
         default:
-            psAbort ("psCoord", "invalid projection");
+            psAbort("invalid projection");
             break;
         }
@@ -493 +493 @@
         case PS_PROJ_CAR:
         case PS_PROJ_MER:
-            psAbort ("psCoord", "projection not yet implemented");
+            psAbort("projection not yet implemented");
             break;
         default:
-            psAbort ("psCoord", "invalid projection");
+            psAbort("invalid projection");
             break;
         }
@@ -502 +502 @@
 
     default:
-        psAbort ("psCoord", "invalid projection");
+        psAbort("invalid projection");
         break;
     }
@@ -557 +557 @@
 
     default:
-        psAbort ("psCoord", "invalid projection");
+        psAbort("invalid projection");
         break;
     }
@@ -603 +603 @@
             break;
         case PS_PROJ_STG:
-            psAbort ("coords", "STG not defined");
+            psAbort("STG not defined");
             break;
         case PS_PROJ_ZEA:
@@ -613 +613 @@
             break;
         default:
-            psAbort ("psCoord", "invalid projection");
+            psAbort("invalid projection");
             break;
         }
@@ -663 +663 @@
             break;
         default:
-            psAbort ("psCoord", "invalid projection");
+            psAbort("invalid projection");
             break;
         }
@@ -670 +670 @@
         break;
     default:
-        psAbort ("psCoord", "invalid projection");
+        psAbort("invalid projection");
         break;
     }

trunk/psLib/src/db/psDB.c

@@ -12 +12 @@
  *  @author Joshua Hoblitt
  *
- *  @version $Revision: 1.134 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2007-02-06 21:36:09 $
+ *  @version $Revision: 1.135 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2007-02-07 23:52:53 $
  *
  *  Copyright (C) 2005-2006  Joshua Hoblitt, University of Hawaii
@@ -141 +141 @@
     mysql = mysql_init(NULL);
     if (!mysql) {
-        psAbort(__func__, "mysql_init(), out of memory.");
+        psAbort("mysql_init(), out of memory.");
     }
 
@@ -856 +856 @@
     MYSQL_STMT *stmt = mysql_stmt_init(dbh->mysql);
     if (!stmt) {
-        psAbort(__func__, "mysql_stmt_init(), out of memory.");
+        psAbort("mysql_stmt_init(), out of memory.");
     }
     if (mysql_stmt_prepare(stmt, query, (unsigned long)strlen(query))) {

trunk/psLib/src/fits/psFitsTable.c

@@ -7 +7 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.24 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2007-01-09 22:38:52 $
+ *  @version $Revision: 1.25 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2007-02-07 23:52:53 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -420 +420 @@
         }
     default:
-        psAbort(__func__, "Shouldn't ever get here.");
+        psAbort("Shouldn't ever get here.");
     }
     return 0;
@@ -697 +697 @@
                 }
             default:
-                psAbort(__func__, "Should never get here.\n");
+                psAbort("Should never get here.\n");
             }
         }

trunk/psLib/src/imageops/psImageGeomManip.c

@@ -10 +10 @@
  *  @author Ross Harman, MHPCC
  *
- *  @version $Revision: 1.34 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2007-01-09 22:38:52 $
+ *  @version $Revision: 1.35 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2007-02-07 23:52:54 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -1058 +1058 @@
     }
 
-    psAbort(__func__, "Should never get here.\n");
+    psAbort("Should never get here.\n");
     return NULL;
 }

trunk/psLib/src/math/psMinimizeLMM.c

@@ -10 +10 @@
  *  @author EAM, IfA
  *
- *  @version $Revision: 1.29 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2007-02-06 21:36:09 $
+ *  @version $Revision: 1.30 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2007-02-07 23:52:54 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -282 +282 @@
         chisq += PS_SQR(delta) * dy->data.F32[i];
         if (isnan(dy->data.F32[i]))
-            psAbort ("psMinLMM", "nan in weights");
+            psAbort("nan in weights");
         if (isnan(delta))
-            psAbort ("psMinLMM", "nan in delta");
+            psAbort("nan in delta");
         if (isnan(chisq))
-            psAbort ("psMinLMM", "nan in chisq");
+            psAbort("nan in chisq");
 
         for (psS32 j = 0; j < params->n; j++) {

trunk/psLib/src/math/psSparse.c

@@ -66 +66 @@
     if (i < j) {
         // psError(PS_ERR_UNKNOWN, true, "i=%d, j=%d refers to a sub-diagonal element. not allowed!");
-        psAbort (__func__, "i=%d, j=%d refers to a sub-diagonal element. not allowed!", i, j);
+        psAbort("i=%d, j=%d refers to a sub-diagonal element. not allowed!", i, j);
         return false;
     }

trunk/psLib/src/math/psStats.c

@@ -13 +13 @@
  * use ->min and ->max (PS_STAT_USE_RANGE)
  *
- *  @version $Revision: 1.199 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2007-01-19 04:32:27 $
+ *  @version $Revision: 1.200 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2007-02-07 23:52:54 $
  *
  *  Copyright 2006 IfA, University of Hawaii
@@ -1870 +1870 @@
     if (stats->options & (PS_STAT_FITTED_MEAN_V2 | PS_STAT_FITTED_STDEV_V2)) {
         if (stats->options & (PS_STAT_FITTED_MEAN | PS_STAT_FITTED_STDEV)) {
-            psAbort ("stats", "you may not specify both FITTED_MEAN and FITTED_MEAN_V2");
+            psAbort("you may not specify both FITTED_MEAN and FITTED_MEAN_V2");
         }
         if (!vectorFittedStats_v2(inF32, errorsF32, maskU8, maskVal, stats)) {
@@ -1881 +1881 @@
     if (stats->options & (PS_STAT_FITTED_MEAN_V3 | PS_STAT_FITTED_STDEV_V3)) {
         if (stats->options & (PS_STAT_FITTED_MEAN | PS_STAT_FITTED_STDEV)) {
-            psAbort ("stats", "you may not specify both FITTED_MEAN and FITTED_MEAN_V3");
+            psAbort("you may not specify both FITTED_MEAN and FITTED_MEAN_V3");
         }
         if (!vectorFittedStats_v3(inF32, errorsF32, maskU8, maskVal, stats)) {
@@ -2024 +2024 @@
         return 0;
     }
-    psAbort(__func__, "Should never get here.\n");
+    psAbort("Should never get here.\n");
     return 0;
 }
@@ -2070 +2070 @@
         return NAN;
     }
-    psAbort(__func__, "Should never get here.\n");
+    psAbort("Should never get here.\n");
     return NAN;
 }

trunk/psLib/src/sys/psAbort.c

@@ -9 +9 @@
  *
  *  @author Eric Van Alst, MHPCC
+ *  @author Joshua Hoblitt, University of Hawaii
  *   
- *  @version $Revision: 1.14 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2007-01-09 22:38:53 $
+ *  @version $Revision: 1.15 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2007-02-07 23:52:54 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -22 +23 @@
 #include <stdarg.h>
 #include <stdlib.h>
+
 #include "psAbort.h"
 #include "psError.h"
 #include "psLogMsg.h"
 
-void psAbort(const char *name, const char *format, ...)
+void p_psAbort(const char *file,
+               unsigned int lineno,
+               const char *func,
+               const char *format,
+               ...)
 {
     psErrorStackPrint(stderr, "Aborting. Error stack:");
@@ -35 +41 @@
 
     // Call logging function with PS_LOG_ABORT level
-    psLogMsgV(name, PS_LOG_ABORT, format, argPtr);
+    psLogMsgV("psLib.sys", PS_LOG_ABORT, format, argPtr);
 
     // Clean up stack after variable arguement has been used

trunk/psLib/src/sys/psAbort.h

@@ -8 +8 @@
  *
  *  @author Eric Van Alst, MHPCC
+ *  @author Joshua Hoblitt, University of Hawaii
  *
- *  $Revision: 1.13 $ $Name: not supported by cvs2svn $
- *  $Date: 2007-01-23 22:47:23 $
+ *  $Revision: 1.14 $ $Name: not supported by cvs2svn $
+ *  $Date: 2007-02-07 23:52:54 $
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
  */
@@ -19 +20 @@
 /// @addtogroup SysUtils System Utilities
 /// @{
+
+#include <stdarg.h>
 
 /** Reports an abort message to logging facility
@@ -30 +33 @@
  *
  */
-#ifdef __GNUC__
+#ifdef DOXYGEN
 void psAbort(
-    const char *name,                  ///< Source of abort such as file or function detected
-    const char *format,                   ///< A printf style formatting statement defining msg
-    ...
-) __attribute__((format(printf, 2, 3)));
-#else // __GNUC__
-void psAbort(
-    const char *name,                  ///< Source of abort such as file or function detected
-    const char *format,                   ///< A printf style formatting statement defining msg
+    const char *format,                 ///< A printf style formatting statement
     ...
 );
-#endif // __GNUC__
+#else // ifdef DOXYGEN
+void p_psAbort(
+    const char *file,                   ///< File of caller
+    unsigned int lineno,                ///< Line number of caller
+    const char *func,                   ///< Function name of caller
+    const char *format,                 ///< A printf style formatting statement
+    ...
+#ifdef __GNUC__
+) __attribute__((format(printf, 4, 5), noreturn));
+#else // ifdef __GNUC__
+);
+#endif // ifdef __GNUC__
+#ifndef SWIG
+#define psAbort(...) \
+      p_psAbort(__FILE__, __LINE__, __func__, __VA_ARGS__)
+#endif // iddef SWIG
+#endif // ifdef DOXYGEN
 
 /// @}

trunk/psLib/src/sys/psError.c

@@ -11 +11 @@
  *  @author Eric Van Alst, MHPCC
  *
- *  @version $Revision: 1.44 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2007-02-07 01:15:49 $
+ *  @version $Revision: 1.45 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2007-02-07 23:52:54 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -65 +65 @@
         psArrayAdd(errorStack, 0, err);
     } else {
-        psAbort(__func__, "attempt to exceed maximum error stack depth of %ld",
+        psAbort("attempt to exceed maximum error stack depth of %ld",
                 (long)MAX_ERROR_STACK_SIZE);
     }
@@ -78 +78 @@
         // thread exits
         if (pthread_key_create(&errorStack_key, psFreeWrapper)) {
-            psAbort(__func__, "pthread_key_create() failed");
+            psAbort("pthread_key_create failed()");
         }
         errorStackKeyInitialized = true;
@@ -95 +95 @@
         // param
         if (pthread_setspecific(errorStack_key, errorStack)) {
-            psAbort(__func__, "pthread_setspecific() failed");
+            psAbort("pthread_setspecific() failed");
         }
     }

trunk/psLib/src/sys/psString.c

@@ -13 +13 @@
  *  @author David Robbins, MHPCC
  *
- *  @version $Revision: 1.50 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2007-02-03 06:01:42 $
+ *  @version $Revision: 1.51 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2007-02-07 23:52:54 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -339 +339 @@
     }
 
-    psAbort(__func__, "Should never get here.\n");
+    psAbort("Should never get here.\n");
     return 0;
 }

trunk/psLib/src/types/psArguments.c

@@ -7 +7 @@
  *  @author David Robbins, MHPCC
  *
- *  @version $Revision: 1.19 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2007-01-09 22:38:53 $
+ *  @version $Revision: 1.20 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2007-02-07 23:52:54 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -301 +301 @@
                 "Argument type (%x) is not supported.\n", arg->type);
         return 0;
-        //        psAbort(__func__, "Argument type (%x) is not supported.\n", arg->type);
+        //        psAbort("Argument type (%x) is not supported.\n", arg->type);
     }
 
@@ -347 +347 @@
             break;
         default:
-            //            psAbort(__func__, "Argument type (%x) for %s is not supported.\n",
+            //            psAbort("Argument type (%x) for %s is not supported.\n",
             //                    item->type, item->name);
             psError(PS_ERR_BAD_PARAMETER_TYPE, true,

trunk/psLib/src/types/psMetadataItemCompare.c

@@ -83 +83 @@
     }
 
-    psAbort(__func__, "Should never get here.\n");
+    psAbort("Should never get here.\n");
     return false;
 }

trunk/psLib/src/types/psMetadataItemParse.c

@@ -39 +39 @@
 
 bool psMetadataItemParseBool(const psMetadataItem *item
-                            )
+                              )
 {
     PS_ASSERT_PTR_NON_NULL(item, false);

trunk/psLib/test/imageops/tst_psImageStats.c

@@ -755 +755 @@
         if ( myStats != tmpStats ) {
             fprintf(stderr,"ERROR: input psStats not equal to return psStats\n");
-            psAbort(__func__,"Failed input psStats equal to returned psStats");
+            psAbort("Failed input psStats equal to returned psStats");
         }
         fprintf(stderr, "The sample mean was %.2f\n", myStats->sampleMean );

trunk/psLib/test/math/tap_psPolyFit1D.c

@@ -331 +331 @@
     memLeaks = psMemCheckLeaks(currentId,NULL,stderr,false);
     if (0 != memLeaks) {
-        psAbort(__func__,"Memory Leaks! (%d leaks)", memLeaks);
+        psAbort("Memory Leaks! (%d leaks)", memLeaks);
     }
 

trunk/psLib/test/math/tap_psPolyFit2D.c

@@ -343 +343 @@
     memLeaks = psMemCheckLeaks(currentId,NULL,stderr,false);
     if (0 != memLeaks) {
-        psAbort(__func__,"Memory Leaks! (%d leaks)", memLeaks);
+        psAbort("Memory Leaks! (%d leaks)", memLeaks);
     }
     return (testStatus);

trunk/psLib/test/math/tap_psPolyFit3D.c

@@ -392 +392 @@
     memLeaks = psMemCheckLeaks(currentId,NULL,stderr,false);
     if (0 != memLeaks) {
-        psAbort(__func__,"Memory Leaks! (%d leaks)", memLeaks);
+        psAbort("Memory Leaks! (%d leaks)", memLeaks);
     }
 

trunk/psLib/test/math/tap_psPolyFit4D.c

@@ -450 +450 @@
     memLeaks = psMemCheckLeaks(currentId,NULL,stderr,false);
     if (0 != memLeaks) {
-        psAbort(__func__,"Memory Leaks! (%d leaks)", memLeaks);
+        psAbort("Memory Leaks! (%d leaks)", memLeaks);
     }
 

trunk/psLib/test/math/tap_psStats07.c

@@ -487 +487 @@
     memLeaks = psMemCheckLeaks(currentId,NULL,stderr,false);
     if (0 != memLeaks) {
-        psAbort(__func__,"Memory Leaks! (%d leaks)", memLeaks);
+        psAbort("Memory Leaks! (%d leaks)", memLeaks);
     }
 

trunk/psLib/test/math/tap_psStats09.c

@@ -338 +338 @@
     memLeaks = psMemCheckLeaks(currentId,NULL,stderr,false);
     if (0 != memLeaks) {
-        psAbort(__func__,"Memory Leaks! (%d leaks)", memLeaks);
+        psAbort("Memory Leaks! (%d leaks)", memLeaks);
     }
 

trunk/psLib/test/math/tst_psFunc01.c

@@ -39 +39 @@
     memLeaks = psMemCheckLeaks(currentId,NULL,stderr,false);
     if (0 != memLeaks) {
-        psAbort(__func__,"Memory Leaks! (%d leaks)", memLeaks);
+        psAbort("Memory Leaks! (%d leaks)", memLeaks);
     }
 
@@ -58 +58 @@
 
     if ( myGaussData->type.type != PS_TYPE_F32) {
-        psAbort(__func__,"p_psGaussianDev did not return a vector of type F32");
+        psAbort("p_psGaussianDev did not return a vector of type F32");
     }
 
@@ -66 +66 @@
     memLeaks = psMemCheckLeaks(currentId,NULL,stderr,false);
     if (0 != memLeaks) {
-        psAbort(__func__,"Memory Leaks! (%d leaks)", memLeaks);
+        psAbort("Memory Leaks! (%d leaks)", memLeaks);
     }
 

trunk/psLib/test/math/tst_psHist00.c

@@ -123 +123 @@
     memLeaks = psMemCheckLeaks(currentId,NULL,stderr,false);
     if (0 != memLeaks) {
-        psAbort(__func__,"Memory Leaks! (%d leaks)", memLeaks);
+        psAbort("Memory Leaks! (%d leaks)", memLeaks);
     }
     psMemCheckCorruption(1);

trunk/psLib/test/math/tst_psHist01.c

@@ -112 +112 @@
     memLeaks = psMemCheckLeaks(currentId,NULL,stderr,false);
     if (0 != memLeaks) {
-        psAbort(__func__,"Memory Leaks! (%d leaks)", memLeaks);
+        psAbort("Memory Leaks! (%d leaks)", memLeaks);
     }
     psMemCheckCorruption(1);

trunk/psLib/test/math/tst_psHist02.c

@@ -179 +179 @@
     memLeaks = psMemCheckLeaks(currentId,NULL,stderr,false);
     if ( 0 != memLeaks ) {
-        psAbort( __func__, "Memory Leaks! (%d leaks)", memLeaks );
+        psAbort("Memory Leaks! (%d leaks)", memLeaks );
     }
     psMemCheckCorruption( 1 );

trunk/psLib/test/math/tst_psHist03.c

@@ -126 +126 @@
     memLeaks = psMemCheckLeaks(currentId,NULL,NULL,false);
     if (0 != memLeaks) {
-        psAbort(__func__,"Memory Leaks! (%d leaks)", memLeaks);
+        psAbort("Memory Leaks! (%d leaks)", memLeaks);
     }
     psMemCheckCorruption(1);

trunk/psLib/test/math/tst_psMathUtils.c

@@ -186 +186 @@
     memLeaks = psMemCheckLeaks(currentId,NULL,stderr,false);
     if (0 != memLeaks) {
-        psAbort(__func__,"Memory Leaks! (%d leaks)", memLeaks);
+        psAbort("Memory Leaks! (%d leaks)", memLeaks);
     }
 

trunk/psLib/test/math/tst_psMinimizeLMM.c

@@ -144 +144 @@
         fflush(stdout);
         // XXX: This is causing a seg fault
-        psAbort(__func__,"Memory Leaks! (%d leaks)", memLeaks);
+        psAbort("Memory Leaks! (%d leaks)", memLeaks);
     }
 

trunk/psLib/test/math/tst_psMinimizePowell.c

@@ -134 +134 @@
     memLeaks = psMemCheckLeaks(currentId,NULL,stderr,false);
     if (0 != memLeaks) {
-        psAbort(__func__,"Memory Leaks! (%d leaks)", memLeaks);
+        psAbort("Memory Leaks! (%d leaks)", memLeaks);
     }
     printFooter(stdout,
@@ -209 +209 @@
     memLeaks = psMemCheckLeaks(currentId,NULL,stderr,false);
     if (0 != memLeaks) {
-        psAbort(__func__,"Memory Leaks! (%d leaks)", memLeaks);
+        psAbort("Memory Leaks! (%d leaks)", memLeaks);
     }
     printFooter(stdout,
@@ -275 +275 @@
     memLeaks = psMemCheckLeaks(currentId,NULL,stderr,false);
     if (0 != memLeaks) {
-        psAbort(__func__,"Memory Leaks! (%d leaks)", memLeaks);
+        psAbort("Memory Leaks! (%d leaks)", memLeaks);
     }
     printFooter(stdout,

trunk/psLib/test/math/tst_psPolyFit1D.c

@@ -306 +306 @@
     memLeaks = psMemCheckLeaks(currentId,NULL,stderr,false);
     if (0 != memLeaks) {
-        psAbort(__func__,"Memory Leaks! (%d leaks)", memLeaks);
+        psAbort("Memory Leaks! (%d leaks)", memLeaks);
     }
 

trunk/psLib/test/math/tst_psPolyFit2D.c

@@ -316 +316 @@
     memLeaks = psMemCheckLeaks(currentId,NULL,stderr,false);
     if (0 != memLeaks) {
-        psAbort(__func__,"Memory Leaks! (%d leaks)", memLeaks);
+        psAbort("Memory Leaks! (%d leaks)", memLeaks);
     }
 

trunk/psLib/test/math/tst_psPolyFit3D.c

@@ -361 +361 @@
     memLeaks = psMemCheckLeaks(currentId,NULL,stderr,false);
     if (0 != memLeaks) {
-        psAbort(__func__,"Memory Leaks! (%d leaks)", memLeaks);
+        psAbort("Memory Leaks! (%d leaks)", memLeaks);
     }
 

trunk/psLib/test/math/tst_psPolyFit4D.c

@@ -413 +413 @@
     memLeaks = psMemCheckLeaks(currentId,NULL,stderr,false);
     if (0 != memLeaks) {
-        psAbort(__func__,"Memory Leaks! (%d leaks)", memLeaks);
+        psAbort("Memory Leaks! (%d leaks)", memLeaks);
     }
 

trunk/psLib/test/math/tst_psSpline1D.c

@@ -13 +13 @@
 *  @author GLG, MHPCC
 *
-*  @version $Revision: 1.8 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2006-02-24 23:43:15 $
+*  @version $Revision: 1.9 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2007-02-07 23:52:54 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -128 +128 @@
     psS32 memLeaks = psMemCheckLeaks(currentId,NULL,stderr,false);
     if (0 != memLeaks) {
-        psAbort(__func__,"Memory Leaks! (%d leaks)", memLeaks);
+        psAbort("Memory Leaks! (%d leaks)", memLeaks);
     }
 
@@ -156 +156 @@
     memLeaks = psMemCheckLeaks(currentId,NULL,stderr,false);
     if (0 != memLeaks) {
-        psAbort(__func__,"Memory Leaks! (%d leaks)", memLeaks);
+        psAbort("Memory Leaks! (%d leaks)", memLeaks);
     }
 
@@ -268 +268 @@
     memLeaks = psMemCheckLeaks(currentId,NULL,stderr,false);
     if (0 != memLeaks) {
-        psAbort(__func__,"Memory Leaks! (%d leaks)", memLeaks);
+        psAbort("Memory Leaks! (%d leaks)", memLeaks);
     }
     /****************************************************************************/
@@ -347 +347 @@
     memLeaks = psMemCheckLeaks(currentId,NULL,stderr,false);
     if (0 != memLeaks) {
-        psAbort(__func__,"Memory Leaks! (%d leaks)", memLeaks);
+        psAbort("Memory Leaks! (%d leaks)", memLeaks);
     }
     return (testStatus);
@@ -461 +461 @@
     memLeaks = psMemCheckLeaks(currentId,NULL,stderr,false);
     if (0 != memLeaks) {
-        psAbort(__func__,"Memory Leaks! (%d leaks)", memLeaks);
+        psAbort("Memory Leaks! (%d leaks)", memLeaks);
     }
     /****************************************************************************/
@@ -540 +540 @@
     memLeaks = psMemCheckLeaks(currentId,NULL,stderr,false);
     if (0 != memLeaks) {
-        psAbort(__func__,"Memory Leaks! (%d leaks)", memLeaks);
+        psAbort("Memory Leaks! (%d leaks)", memLeaks);
     }
     return (testStatus);
@@ -644 +644 @@
     memLeaks = psMemCheckLeaks(currentId,NULL,stderr,false);
     if (0 != memLeaks) {
-        psAbort(__func__,"Memory Leaks! (%d leaks)", memLeaks);
+        psAbort("Memory Leaks! (%d leaks)", memLeaks);
     }
     /****************************************************************************/
@@ -723 +723 @@
     memLeaks = psMemCheckLeaks(currentId,NULL,stderr,false);
     if (0 != memLeaks) {
-        psAbort(__func__,"Memory Leaks! (%d leaks)", memLeaks);
+        psAbort("Memory Leaks! (%d leaks)", memLeaks);
     }
     return (testStatus);
@@ -870 +870 @@
     memLeaks = psMemCheckLeaks(currentId,NULL,stderr,false);
     if (0 != memLeaks) {
-        psAbort(__func__,"Memory Leaks! (%d leaks)", memLeaks);
+        psAbort("Memory Leaks! (%d leaks)", memLeaks);
     }
     return (testStatus);

trunk/psLib/test/math/tst_psStats03.c

@@ -125 +125 @@
     memLeaks = psMemCheckLeaks(currentId,NULL,stderr,false);
     if (0 != memLeaks) {
-        psAbort(__func__,"Memory Leaks! (%d leaks)", memLeaks);
+        psAbort("Memory Leaks! (%d leaks)", memLeaks);
     }
 

trunk/psLib/test/math/tst_psStats05.c

@@ -74 +74 @@
     memLeaks = psMemCheckLeaks(currentId,NULL,stderr,false);
     if (0 != memLeaks) {
-        psAbort(__func__,"Memory Leaks! (%d leaks)", memLeaks);
+        psAbort("Memory Leaks! (%d leaks)", memLeaks);
     }
     psMemCheckCorruption(1);

trunk/psLib/test/math/tst_psStats06.c

@@ -136 +136 @@
     memLeaks = psMemCheckLeaks(currentId,NULL,stderr,false);
     if (0 != memLeaks) {
-        psAbort(__func__,"Memory Leaks! (%d leaks)", memLeaks);
+        psAbort("Memory Leaks! (%d leaks)", memLeaks);
     }
 

trunk/psLib/test/math/tst_psStats07.c

@@ -443 +443 @@
     memLeaks = psMemCheckLeaks(currentId,NULL,stderr,false);
     if (0 != memLeaks) {
-        psAbort(__func__,"Memory Leaks! (%d leaks)", memLeaks);
+        psAbort("Memory Leaks! (%d leaks)", memLeaks);
     }
 

trunk/psLib/test/math/tst_psStats08.c

@@ -179 +179 @@
     memLeaks = psMemCheckLeaks(currentId,NULL,stderr,false);
     if (0 != memLeaks) {
-        psAbort(__func__,"Memory Leaks! (%d leaks)", memLeaks);
+        psAbort("Memory Leaks! (%d leaks)", memLeaks);
     }
 

trunk/psLib/test/math/tst_psStats09.c

@@ -319 +319 @@
     memLeaks = psMemCheckLeaks(currentId,NULL,stderr,false);
     if (0 != memLeaks) {
-        psAbort(__func__,"Memory Leaks! (%d leaks)", memLeaks);
+        psAbort("Memory Leaks! (%d leaks)", memLeaks);
     }
 

trunk/psLib/test/types/tst_psBitSet.c

@@ -17 +17 @@
  *  @author  Ross Harman, MHPCC
  *
- *  @version $Revision: 1.2 $  $Name: not supported by cvs2svn $
- *  @date  $Date: 2006-09-26 01:47:22 $
+ *  @version $Revision: 1.3 $  $Name: not supported by cvs2svn $
+ *  @date  $Date: 2007-02-07 23:52:54 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -123 +123 @@
             psBitSetTest(bs,23) ) {
 
-        psAbort("testBitSet01b","psBitSetAlloc failed to clear all bits at allocation.");
+        psAbort("psBitSetAlloc failed to clear all bits at allocation.");
     }
 
@@ -135 +135 @@
     bs = psBitSetSet(bs, 23);
     if(bs != tempBs) {
-        psAbort("testBitSet01b",
-                "Return pointer not equal to output argument pointer.");
+        psAbort(                "Return pointer not equal to output argument pointer.");
     }
     if(bs->bits[0] != 0x05) {
-        psAbort(__func__,
-                "Unexpected value for first byte (%d vs 5).",
+        psAbort(                "Unexpected value for first byte (%d vs 5).",
                 bs->bits[0]);
     }
@@ -154 +152 @@
             ! psBitSetTest(bs,23) ) {
 
-        psAbort("testBitSet01b","Failed to set a bit.");
+        psAbort("Failed to set a bit.");
     }
 
@@ -173 +171 @@
             psBitSetTest(bs,23) ) {
 
-        psAbort("testBitSet01b","Failed to clear a bit.");
+        psAbort("Failed to clear a bit.");
     }
 
@@ -195 +193 @@
     if (err->code != PS_ERR_BAD_PARAMETER_VALUE) {
         psErrorStackPrint(stderr,"Error Stack:");
-        psAbort("testBitSet01c","psBitSetSet(bs, -4) didn't generate expected error.\n");
+        psAbort("psBitSetSet(bs, -4) didn't generate expected error.\n");
     }
     psFree(err);
@@ -206 +204 @@
     if (err->code != PS_ERR_BAD_PARAMETER_VALUE) {
         psErrorStackPrint(stderr,"Error Stack:");
-        psAbort("testBitSet01c","psBitSetSet(bs, 200) didn't generate expected error.\n");
+        psAbort("psBitSetSet(bs, 200) didn't generate expected error.\n");
     }
     psFree(err);
@@ -217 +215 @@
     if (err->code != PS_ERR_BAD_PARAMETER_NULL) {
         psErrorStackPrint(stderr,"Error Stack:");
-        psAbort("testBitSet01c","psBitSetSet(NULL,0) didn't generate expected error.\n");
+        psAbort("psBitSetSet(NULL,0) didn't generate expected error.\n");
     }
     psFree(err);
@@ -242 +240 @@
             ! psBitSetTest(bs,23) ) {
 
-        psAbort("testBitSet01c","Set bits returned false.");
+        psAbort("Set bits returned false.");
     }
 
@@ -248 +246 @@
     psErrorClear();
     if(psBitSetTest(bs, -4)) {
-        psAbort("testBitSet01c","psBitSetTest returned true with negative bit position.\n");
+        psAbort("psBitSetTest returned true with negative bit position.\n");
     }
 
@@ -254 +252 @@
     if (err->code != PS_ERR_BAD_PARAMETER_VALUE) {
         psErrorStackPrint(stderr,"Error Stack:");
-        psAbort("testBitSet01c","psBitSetTest(bs, -4) didn't generate proper error.\n");
+        psAbort("psBitSetTest(bs, -4) didn't generate proper error.\n");
     }
     psFree(err);
@@ -261 +259 @@
     psErrorClear();
     if(psBitSetTest(bs, 200)) {
-        psAbort("testBitSet01c","psBitSetTest returned true with too-large bit position.\n");
+        psAbort("psBitSetTest returned true with too-large bit position.\n");
     }
 
@@ -267 +265 @@
     if (err->code != PS_ERR_BAD_PARAMETER_VALUE) {
         psErrorStackPrint(stderr,"Error Stack:");
-        psAbort("testBitSet01c","psBitSetTest(bs, 200) didn't generate proper error.\n");
+        psAbort("psBitSetTest(bs, 200) didn't generate proper error.\n");
     }
     psFree(err);
@@ -274 +272 @@
     psErrorClear();
     if (psBitSetTest(NULL, 0)) {
-        psAbort("testBitSet01c","psBitSetTest returned true with NULL psBitSet.\n");
+        psAbort("psBitSetTest returned true with NULL psBitSet.\n");
     }
 
@@ -280 +278 @@
     if (err->code != PS_ERR_BAD_PARAMETER_NULL) {
         psErrorStackPrint(stderr,"Error Stack:");
-        psAbort("testBitSet01c","psBitSetTest(NULL, 0) didn't generate proper error.\n");
+        psAbort("psBitSetTest(NULL, 0) didn't generate proper error.\n");
     }
     psFree(err);
@@ -323 +321 @@
     outbs = psBitSetOp(outbs, bs1, "AND", bs2);
     if (outbs == NULL) {
-        psAbort(__func__,"psBitSetOp returned a NULL result for AND operation");
+        psAbort("psBitSetOp returned a NULL result for AND operation");
     }
 
@@ -333 +331 @@
             binOut2 = psBitSetToString(bs2);
             binOut3 = psBitSetToString(outbs);
-            psAbort(__func__,"psBitSetOp with AND operator failed.\nInput was %s, %s.  Output was %s",
+            psAbort("psBitSetOp with AND operator failed.\nInput was %s, %s.  Output was %s",
                     binOut1,binOut2,binOut3);
         }
@@ -343 +341 @@
     outbs = psBitSetOp(NULL, bs1, "AND", bs2);
     if (outbs == NULL) {
-        psAbort(__func__,"psBitSetOp failed to create a new psBitSet for the result");
+        psAbort("psBitSetOp failed to create a new psBitSet for the result");
     }
     for(psS32 i=0; i<24; i++) {
@@ -352 +350 @@
             binOut2 = psBitSetToString(bs2);
             binOut3 = psBitSetToString(outbs);
-            psAbort(__func__,"psBitSetOp with AND operator failed.\nInput was %s, %s.  Output was %s",
+            psAbort("psBitSetOp with AND operator failed.\nInput was %s, %s.  Output was %s",
                     binOut1,binOut2,binOut3);
         }
@@ -400 +398 @@
     outbs = psBitSetOp(outbs, bs1, "OR", bs2);
     if (outbs == NULL) {
-        psAbort(__func__,"psBitSetOp returned a NULL result for OR operation");
+        psAbort("psBitSetOp returned a NULL result for OR operation");
     }
 
@@ -410 +408 @@
             binOut2 = psBitSetToString(bs2);
             binOut3 = psBitSetToString(outbs);
-            psAbort(__func__,"psBitSetOp with OR operator failed.\nInput was %s, %s.  Output was %s",
+            psAbort("psBitSetOp with OR operator failed.\nInput was %s, %s.  Output was %s",
                     binOut1,binOut2,binOut3);
         }
@@ -420 +418 @@
     outbs = psBitSetOp(NULL, bs1, "OR", bs2);
     if (outbs == NULL) {
-        psAbort(__func__,"psBitSetOp failed to create a new psBitSet for the result");
+        psAbort("psBitSetOp failed to create a new psBitSet for the result");
     }
     for(psS32 i=0; i<24; i++) {
@@ -429 +427 @@
             binOut2 = psBitSetToString(bs2);
             binOut3 = psBitSetToString(outbs);
-            psAbort(__func__,"psBitSetOp with OR operator failed.\nInput was %s, %s.  Output was %s",
+            psAbort("psBitSetOp with OR operator failed.\nInput was %s, %s.  Output was %s",
                     binOut1,binOut2,binOut3);
         }
@@ -478 +476 @@
     outbs = psBitSetOp(outbs, bs1, "XOR", bs2);
     if (outbs == NULL) {
-        psAbort(__func__,"psBitSetOp returned a NULL result for XOR operation");
+        psAbort("psBitSetOp returned a NULL result for XOR operation");
     }
 
@@ -488 +486 @@
             binOut2 = psBitSetToString(bs2);
             binOut3 = psBitSetToString(outbs);
-            psAbort(__func__,"psBitSetOp with XOR operator failed.\nInput was %s, %s.  Output was %s",
+            psAbort("psBitSetOp with XOR operator failed.\nInput was %s, %s.  Output was %s",
                     binOut1,binOut2,binOut3);
         }
@@ -498 +496 @@
     outbs = psBitSetOp(NULL, bs1, "XOR", bs2);
     if (outbs == NULL) {
-        psAbort(__func__,"psBitSetOp failed to create a new psBitSet for the result");
+        psAbort("psBitSetOp failed to create a new psBitSet for the result");
     }
     for(psS32 i=0; i<24; i++) {
@@ -507 +505 @@
             binOut2 = psBitSetToString(bs2);
             binOut3 = psBitSetToString(outbs);
-            psAbort(__func__,"psBitSetOp with XOR operator failed.\nInput was %s, %s.  Output was %s",
+            psAbort("psBitSetOp with XOR operator failed.\nInput was %s, %s.  Output was %s",
                     binOut1,binOut2,binOut3);
         }
@@ -549 +547 @@
     outbs = psBitSetNot(outbs, bs1);
     if (outbs == NULL) {
-        psAbort(__func__,"psBitSetOp returned a NULL result for NOT operation");
+        psAbort("psBitSetOp returned a NULL result for NOT operation");
     }
 
@@ -558 +556 @@
             binOut1 = psBitSetToString(bs1);
             binOut2 = psBitSetToString(outbs);
-            psAbort(__func__,"psBitSetOp with NOT operator failed.\nInput was %s.  Output was %s",
+            psAbort("psBitSetOp with NOT operator failed.\nInput was %s.  Output was %s",
                     binOut1,binOut2);
         }
@@ -568 +566 @@
     outbs = psBitSetNot(NULL, bs1);
     if (outbs == NULL) {
-        psAbort(__func__,"psBitSetOp failed to create a new psBitSet for the result");
+        psAbort("psBitSetOp failed to create a new psBitSet for the result");
     }
     for(psS32 i=0; i<24; i++) {
@@ -576 +574 @@
             binOut1 = psBitSetToString(bs1);
             binOut2 = psBitSetToString(outbs);
-            psAbort(__func__,"psBitSetOp with NOT operator failed.\nInput was %s.  Output was %s",
+            psAbort("psBitSetOp with NOT operator failed.\nInput was %s.  Output was %s",
                     binOut1,binOut2);
         }
@@ -605 +603 @@
     psBitSet* outbs = psBitSetOp(NULL, bs1, "XOR", bs2);
     if (outbs != NULL) {
-        psAbort(__func__,"psBitSetOp did not return a NULL result when input sizes differ");
+        psAbort("psBitSetOp did not return a NULL result when input sizes differ");
     }
 
@@ -611 +609 @@
     if (err->code != PS_ERR_BAD_PARAMETER_SIZE) {
         psErrorStackPrint(stderr,"Error Stack:");
-        psAbort(__func__,"psBitSetOp didn't generate expected error with operands' sizes differed.");
+        psAbort("psBitSetOp didn't generate expected error with operands' sizes differed.");
     }
     psFree(err);
@@ -623 +621 @@
     psBitSet* outbs2 = psBitSetOp(outbs, bs1, "XOR", bs2);
     if (outbs2 == NULL) {
-        psAbort(__func__,"psBitSetOp failed when input size and output size differed (a recoverable error).");
+        psAbort("psBitSetOp failed when input size and output size differed (a recoverable error).");
     }
     if (outbs2 != outbs) {
-        psAbort(__func__,"psBitSetOp didn't reuse the given output struct.");
+        psAbort("psBitSetOp didn't reuse the given output struct.");
     }
     if (outbs2->n != bs1->n) {
-        psAbort(__func__,"psBitSetOp did properly adjust the output psBitSet size.");
+        psAbort("psBitSetOp did properly adjust the output psBitSet size.");
     }
 
@@ -636 +634 @@
     outbs = psBitSetOp(outbs, bs1, "FOO", bs2);
     if (outbs != NULL) {
-        psAbort(__func__,"psBitSetOp returned something in case of a bogus operation.");
+        psAbort("psBitSetOp returned something in case of a bogus operation.");
     }
     err = psErrorLast();
     if (err->code != PS_ERR_BAD_PARAMETER_VALUE) {
         psErrorStackPrint(stderr,"Error Stack:");
-        psAbort(__func__,"psBitSetOp didn't generate expected error with bogus operator.");
+        psAbort("psBitSetOp didn't generate expected error with bogus operator.");
     }
     psFree(err);
@@ -655 +653 @@
     if (err->code != PS_ERR_BAD_PARAMETER_VALUE) {
         psErrorStackPrint(stderr,"Error Stack:");
-        psAbort(__func__,"psBitSetOp didn't generate expected error with bogus operator.");
+        psAbort("psBitSetOp didn't generate expected error with bogus operator.");
     }
     psFree(err);

trunk/psLib/test/types/tst_psHash00.c

@@ -57 +57 @@
     memLeaks = psMemCheckLeaks(currentId,NULL,stderr,false);
     if (0 != memLeaks) {
-        psAbort(__func__,"Memory Leaks! (%d leaks)", memLeaks);
+        psAbort("Memory Leaks! (%d leaks)", memLeaks);
     }
     psMemCheckCorruption(1);

trunk/psLib/test/types/tst_psHash01.c

@@ -148 +148 @@
     memLeaks = psMemCheckLeaks(currentId,NULL,stderr,false);
     if (memLeaks != 0) {
-        psAbort(__func__,"Memory Leaks! (%d leaks)", memLeaks);
+        psAbort("Memory Leaks! (%d leaks)", memLeaks);
     }
     psMemCheckCorruption(1);

trunk/psLib/test/types/tst_psHash02.c

@@ -106 +106 @@
     memLeaks = psMemCheckLeaks(currentId,NULL,stderr,false);
     if (0 != memLeaks) {
-        psAbort(__func__,"Memory Leaks! (%d leaks)", memLeaks);
+        psAbort("Memory Leaks! (%d leaks)", memLeaks);
     }
     psMemCheckCorruption(1);

trunk/psLib/test/types/tst_psHash03.c

@@ -134 +134 @@
     memLeaks = psMemCheckLeaks(currentId,NULL,stdout,false);
     if (memLeaks != 0) {
-        psAbort(__func__,"Memory Leaks! (%d leaks)", memLeaks);
+        psAbort("Memory Leaks! (%d leaks)", memLeaks);
     }
     psMemCheckCorruption(true);

trunk/psLib/test/types/tst_psHash04.c

@@ -77 +77 @@
     memLeaks = psMemCheckLeaks(currentId,NULL,stderr,false);
     if (memLeaks != 0) {
-        psAbort(__func__,"Memory Leaks! (%d leaks)", memLeaks);
+        psAbort("Memory Leaks! (%d leaks)", memLeaks);
     }
     psMemCheckCorruption(1);