Index: /branches/jch-memory/psLib/src/sys/psMemory.c
===================================================================
--- /branches/jch-memory/psLib/src/sys/psMemory.c	(revision 10910)
+++ /branches/jch-memory/psLib/src/sys/psMemory.c	(revision 10911)
@@ -9,6 +9,6 @@
 *  @author Joshua Hoblitt, University of Hawaii
 *
-*  @version $Revision: 1.88.2.18 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2007-01-05 02:52:24 $
+*  @version $Revision: 1.88.2.19 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2007-01-05 02:54:36 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -50,4 +50,7 @@
 // from within the memory subsystem.  Previous implementations tried to do
 // this and would deadlock while trying to allocate memory.
+//
+// Note that psError() is also *UNSAFE* to use from within the memory
+// subsystem.
 #define PS_MEM_ABORT(name, ...) \
 P_PS_MEM_ABORT(__FILE__, __LINE__, __func__, name, __VA_ARGS__)
@@ -61,14 +64,4 @@
 fprintf(stderr, "\n");\
 abort();
-
-// As with psAbort(), psError() is also *UNSAFE* to use from within the memory
-// subsystem.
-#define PS_MEM_ERROR(code, new, ...) \
-P_PS_MEM_ERROR(__FILE__, __LINE__, __func__, code, new, __VA_ARGS__)
-
-#define P_PS_MEM_ERROR(filename, lineno, func, code, new, ...) \
-fprintf(stderr, "%s (%s:%d) ", func, filename, lineno); \
-fprintf(stderr, __VA_ARGS__);\
-fprintf(stderr, "\n");
 
 #define HANDLE_BAD_BLOCK(memBlock, file, lineo, func) \
@@ -942,7 +935,4 @@
     }
 
-    PS_MEM_ERROR(PS_ERR_BAD_PARAMETER_TYPE, true,
-                 "Invalid datatype specified.\n");
-
     return false;
 }