Index: trunk/psLib/src/collections/psScalar.c
===================================================================
--- trunk/psLib/src/collections/psScalar.c	(revision 2055)
+++ trunk/psLib/src/collections/psScalar.c	(revision 2273)
@@ -8,6 +8,6 @@
  *  @author Ross Harman, MHPCC
  *
- *  @version $Revision: 1.11 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-10-12 19:32:44 $
+ *  @version $Revision: 1.12 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-11-04 01:04:57 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -70,8 +70,7 @@
         break;
     default:
-        psErrorMsg(PS_ERRORNAME_DOMAIN "psScalarAlloc",
-                   PS_ERR_BAD_PARAMETER_TYPE, true,
-                   PS_ERRORTEXT_psScalar_UNSUPPORTED_TYPE,
-                   dataType);
+        psError(PS_ERR_BAD_PARAMETER_TYPE, true,
+                PS_ERRORTEXT_psScalar_UNSUPPORTED_TYPE,
+                dataType);
     }
 
@@ -85,7 +84,6 @@
 
     if (scalar == NULL) {
-        psErrorMsg(PS_ERRORNAME_DOMAIN "psScalarCopy",
-                   PS_ERR_BAD_PARAMETER_NULL, true,
-                   PS_ERRORTEXT_psScalar_COPY_NULL);
+        psError(PS_ERR_BAD_PARAMETER_NULL, true,
+                PS_ERRORTEXT_psScalar_COPY_NULL);
         return NULL;
     }
@@ -130,8 +128,7 @@
         break;
     default:
-        psErrorMsg(PS_ERRORNAME_DOMAIN "psScalarCopy",
-                   PS_ERR_BAD_PARAMETER_TYPE, true,
-                   PS_ERRORTEXT_psScalar_UNSUPPORTED_TYPE,
-                   dataType);
+        psError(PS_ERR_BAD_PARAMETER_TYPE, true,
+                PS_ERRORTEXT_psScalar_UNSUPPORTED_TYPE,
+                dataType);
     }