Changeset 2273 for trunk/psLib/src/sysUtils/psMemory.c

Timestamp:

Nov 3, 2004, 3:05:00 PM (22 years ago)

Author:

desonia

Message:

changed the psError signature to match SDRS. Also made misc. cleanups as
I was combing the files.

File:

• trunk/psLib/src/sysUtils/psMemory.c (modified) (5 diffs)

trunk/psLib/src/sysUtils/psMemory.c

@@ -8 +8 @@
 *  @author Robert Lupton, Princeton University
 *
-*  @version $Revision: 1.43 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2004-10-27 19:35:59 $
+*  @version $Revision: 1.44 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2004-11-04 01:05:00 $
 *
 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -100 +100 @@
 {
     if (ptr->refCounter < 1) {
-        psErrorMsg(PS_ERRORNAME_DOMAIN "memProblemCallbackDefault", false, PS_ERR_MEMORY_CORRUPTION,
-                   PS_ERRORTEXT_psMemory_MULTIPLE_FREE,
-                   ptr->id, ptr->file, ptr->lineno, file, lineno);
+        psError(PS_ERR_MEMORY_CORRUPTION, false,
+                PS_ERRORTEXT_psMemory_MULTIPLE_FREE,
+                ptr->id, ptr->file, ptr->lineno, file, lineno);
     }
 
@@ -228 +228 @@
 
     if (m == NULL) {
-        psErrorMsg(PS_ERRORNAME_DOMAIN "checkMemBlock", true, PS_ERR_MEMORY_CORRUPTION,
-                   PS_ERRORTEXT_psMemory_NULL_BLOCK);
+        psError(PS_ERR_MEMORY_CORRUPTION, true,
+                PS_ERRORTEXT_psMemory_NULL_BLOCK);
         return 1;
     }
@@ -235 +235 @@
     if (m->refCounter == 0) {
         // using an unreferenced block of memory, are you?
-        psErrorMsg(PS_ERRORNAME_DOMAIN "checkMemBlock", true, PS_ERR_MEMORY_CORRUPTION,
-                   PS_ERRORTEXT_psMemory_DEREF_BLOCK_USE,
-                   m->id);
+        psError(PS_ERR_MEMORY_CORRUPTION, true,
+                PS_ERRORTEXT_psMemory_DEREF_BLOCK_USE,
+                m->id);
         return 1;
     }
 
     if (m->startblock != P_PS_MEMMAGIC || m->endblock != P_PS_MEMMAGIC) {
-        psErrorMsg(PS_ERRORNAME_DOMAIN "checkMemBlock", true, PS_ERR_MEMORY_CORRUPTION,
-                   PS_ERRORTEXT_psMemory_UNDERFLOW,
-                   m->id);
+        psError(PS_ERR_MEMORY_CORRUPTION, true,
+                PS_ERRORTEXT_psMemory_UNDERFLOW,
+                m->id);
         return 1;
     }
     if (*(psPtr *)((int8_t *) (m + 1) + m->userMemorySize) != P_PS_MEMMAGIC) {
-        psErrorMsg(PS_ERRORNAME_DOMAIN "checkMemBlock", true, PS_ERR_MEMORY_CORRUPTION,
-                   PS_ERRORTEXT_psMemory_OVERFLOW,
-                   m->id);
+        psError(PS_ERR_MEMORY_CORRUPTION, true,
+                PS_ERRORTEXT_psMemory_OVERFLOW,
+                m->id);
         return 1;
     }
@@ -431 +431 @@
         psMemBlock* ptr = ((psMemBlock* ) vptr) - 1;
 
-        psErrorMsg(PS_ERRORNAME_DOMAIN "psFree",PS_ERR_MEMORY_DEREF_USAGE,true,
-                   PS_ERRORTEXT_psMemory_MULTIPLE_FREE,
-                   ptr->id, ptr->file, ptr->lineno, file, lineno);
+        psError(PS_ERR_MEMORY_DEREF_USAGE,true,
+                PS_ERRORTEXT_psMemory_MULTIPLE_FREE,
+                ptr->id, ptr->file, ptr->lineno, file, lineno);
 
         return;