Index: trunk/psLib/src/collections/psBitSet.c
===================================================================
--- trunk/psLib/src/collections/psBitSet.c	(revision 2204)
+++ trunk/psLib/src/collections/psBitSet.c	(revision 2273)
@@ -11,6 +11,6 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.19 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-10-27 00:57:31 $
+ *  @version $Revision: 1.20 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-11-04 01:04:57 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -72,8 +72,7 @@
 
     if (n < 0) {
-        psErrorMsg(PS_ERRORNAME_DOMAIN "psBitSetAlloc",
-                   PS_ERR_BAD_PARAMETER_VALUE, true,
-                   PS_ERRORTEXT_psBitSet_ALLOC_NEG_SIZE,
-                   n);
+        psError(PS_ERR_BAD_PARAMETER_VALUE, true,
+                PS_ERRORTEXT_psBitSet_ALLOC_NEG_SIZE,
+                n);
         return NULL;
     }
@@ -99,14 +98,12 @@
 
     if (inBitSet == NULL) {
-        psErrorMsg(PS_ERRORNAME_DOMAIN "psBitSetSet",
-                   PS_ERR_BAD_PARAMETER_NULL, true,
-                   PS_ERRORTEXT_psBitSet_SET_NULL);
+        psError(PS_ERR_BAD_PARAMETER_NULL, true,
+                PS_ERRORTEXT_psBitSet_SET_NULL);
         return inBitSet;
     } else if ( (bit < 0) ||
                 (bit > inBitSet->n * 8 - 1) ) {
-        psErrorMsg(PS_ERRORNAME_DOMAIN "psBitSetSet",
-                   PS_ERR_BAD_PARAMETER_VALUE, true,
-                   PS_ERRORTEXT_psBitSet_BIT_OUTOFRANGE,
-                   bit,inBitSet->n * 8 - 1);
+        psError(PS_ERR_BAD_PARAMETER_VALUE, true,
+                PS_ERRORTEXT_psBitSet_BIT_OUTOFRANGE,
+                bit,inBitSet->n * 8 - 1);
         return inBitSet;
     }
@@ -124,14 +121,12 @@
 
     if (inBitSet == NULL) {
-        psErrorMsg(PS_ERRORNAME_DOMAIN "psBitSetClear",
-                   PS_ERR_BAD_PARAMETER_NULL, true,
-                   PS_ERRORTEXT_psBitSet_SET_NULL);
+        psError(PS_ERR_BAD_PARAMETER_NULL, true,
+                PS_ERRORTEXT_psBitSet_SET_NULL);
         return inBitSet;
     } else if ( (bit < 0) ||
                 (bit > inBitSet->n * 8 - 1) ) {
-        psErrorMsg(PS_ERRORNAME_DOMAIN "psBitSetClear",
-                   PS_ERR_BAD_PARAMETER_VALUE, true,
-                   PS_ERRORTEXT_psBitSet_BIT_OUTOFRANGE,
-                   bit,inBitSet->n * 8 - 1);
+        psError(PS_ERR_BAD_PARAMETER_VALUE, true,
+                PS_ERRORTEXT_psBitSet_BIT_OUTOFRANGE,
+                bit,inBitSet->n * 8 - 1);
         return inBitSet;
     }
@@ -149,14 +144,12 @@
 
     if (inBitSet == NULL) {
-        psErrorMsg(PS_ERRORNAME_DOMAIN "psBitSetTest",
-                   PS_ERR_BAD_PARAMETER_NULL, true,
-                   PS_ERRORTEXT_psBitSet_SET_NULL);
+        psError(PS_ERR_BAD_PARAMETER_NULL, true,
+                PS_ERRORTEXT_psBitSet_SET_NULL);
         return false;
     } else if ( (bit < 0) ||
                 (bit > inBitSet->n * 8 - 1) ) {
-        psErrorMsg(PS_ERRORNAME_DOMAIN "psBitSetTest",
-                   PS_ERR_BAD_PARAMETER_VALUE, true,
-                   PS_ERRORTEXT_psBitSet_BIT_OUTOFRANGE,
-                   bit,inBitSet->n * 8 - 1);
+        psError(PS_ERR_BAD_PARAMETER_VALUE, true,
+                PS_ERRORTEXT_psBitSet_BIT_OUTOFRANGE,
+                bit,inBitSet->n * 8 - 1);
         return false;
     }
@@ -180,7 +173,6 @@
 
     if (inBitSet1 == NULL) {
-        psErrorMsg(PS_ERRORNAME_DOMAIN "psBitSetOp",
-                   PS_ERR_BAD_PARAMETER_NULL, true,
-                   PS_ERRORTEXT_psBitSet_FIRST_OPERAND_NULL);
+        psError(PS_ERR_BAD_PARAMETER_NULL, true,
+                PS_ERRORTEXT_psBitSet_FIRST_OPERAND_NULL);
         psFree(outBitSet);
         return NULL;
@@ -189,7 +181,6 @@
 
     if (operator == NULL) {
-        psErrorMsg(PS_ERRORNAME_DOMAIN "psBitSetOp",
-                   PS_ERR_BAD_PARAMETER_NULL, true,
-                   PS_ERRORTEXT_psBitSet_OPERATOR_NULL);
+        psError(PS_ERR_BAD_PARAMETER_NULL, true,
+                PS_ERRORTEXT_psBitSet_OPERATOR_NULL);
         psFree(outBitSet);
         return NULL;
@@ -217,8 +208,7 @@
         psFree(tempStr);
         psFree(outBitSet);
-        psErrorMsg(PS_ERRORNAME_DOMAIN "psBitSetOp",
-                   PS_ERR_BAD_PARAMETER_VALUE, true,
-                   PS_ERRORTEXT_psBitSet_OPERATOR_INVALID,
-                   operator);
+        psError(PS_ERR_BAD_PARAMETER_VALUE, true,
+                PS_ERRORTEXT_psBitSet_OPERATOR_INVALID,
+                operator);
         return NULL;
     }
@@ -227,7 +217,6 @@
     if (op != NOT_OP) {
         if (inBitSet2 == NULL) {
-            psErrorMsg(PS_ERRORNAME_DOMAIN "psBitSetOp",
-                       PS_ERR_BAD_PARAMETER_NULL, true,
-                       PS_ERRORTEXT_psBitSet_SECOND_OPERAND_NULL);
+            psError(PS_ERR_BAD_PARAMETER_NULL, true,
+                    PS_ERRORTEXT_psBitSet_SECOND_OPERAND_NULL);
             psFree(outBitSet);
             return NULL;
@@ -235,7 +224,6 @@
 
         if (inBitSet1->n != inBitSet2->n) {
-            psErrorMsg(PS_ERRORNAME_DOMAIN "psBitSetOp",
-                       PS_ERR_BAD_PARAMETER_SIZE, true,
-                       PS_ERRORTEXT_psBitSet_OPERANDS_SIZE_DIFFER);
+            psError(PS_ERR_BAD_PARAMETER_SIZE, true,
+                    PS_ERRORTEXT_psBitSet_OPERANDS_SIZE_DIFFER);
             psFree(outBitSet);
             return NULL;
@@ -287,7 +275,6 @@
 {
     if (inBitSet == NULL) {
-        psErrorMsg(PS_ERRORNAME_DOMAIN "psBitSetNot",
-                   PS_ERR_BAD_PARAMETER_NULL, true,
-                   PS_ERRORTEXT_psBitSet_OPERAND_NULL);
+        psError(PS_ERR_BAD_PARAMETER_NULL, true,
+                PS_ERRORTEXT_psBitSet_OPERAND_NULL);
         psFree(outBitSet);
         return NULL;
@@ -297,7 +284,6 @@
 
     if (outBitSet == NULL) {
-        psErrorMsg(PS_ERRORNAME_DOMAIN "psBitSetNot",
-                   PS_ERR_UNKNOWN, false,
-                   PS_ERRORTEXT_psBitSet_NOT_OP_FAILED);
+        psError(PS_ERR_UNKNOWN, false,
+                PS_ERRORTEXT_psBitSet_NOT_OP_FAILED);
     }