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

Timestamp:

Sep 7, 2004, 2:15:16 PM (22 years ago)

Author:

desonia

Message:

changed error-text define names to indicate the file where used, not function.

File:

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

trunk/psLib/src/sysUtils/psMemory.c

@@ -9 +9 @@
 *  @author Robert Lupton, Princeton University
 *
-*  @version $Revision: 1.35 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2004-09-07 19:05:07 $
+*  @version $Revision: 1.36 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2004-09-08 00:15:16 $
 *
 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -104 +104 @@
     if (ptr->refCounter < 1) {
         psErrorMsg(ERRORNAME_PREFIX "memProblemCallbackDefault", false, PS_ERR_MEMORY_CORRUPTION,
-                   PS_ERRORTEXT_memProblemCallbackDefault_MULTIPLE_FREE,
+                   PS_ERRORTEXT_psMemory_MULTIPLE_FREE,
                    ptr->id, ptr->file, ptr->lineno, file, lineno);
     }
@@ -232 +232 @@
     if (m == NULL) {
         psErrorMsg(ERRORNAME_PREFIX "checkMemBlock", true, PS_ERR_MEMORY_CORRUPTION,
-                   PS_ERRORTEXT_checkMemBlock_NULL_BLOCK);
+                   PS_ERRORTEXT_psMemory_NULL_BLOCK);
         return 1;
     }
@@ -239 +239 @@
         // using an unreferenced block of memory, are you?
         psErrorMsg(ERRORNAME_PREFIX "checkMemBlock", true, PS_ERR_MEMORY_CORRUPTION,
-                   PS_ERRORTEXT_checkMemBlock_DEREF_USE,
+                   PS_ERRORTEXT_psMemory_DEREF_BLOCK_USE,
                    m->id);
         return 1;
@@ -246 +246 @@
     if (m->startblock != P_PS_MEMMAGIC || m->endblock != P_PS_MEMMAGIC) {
         psErrorMsg(ERRORNAME_PREFIX "checkMemBlock", true, PS_ERR_MEMORY_CORRUPTION,
-                   PS_ERRORTEXT_checkMemBlock_UNDERFLOW,
+                   PS_ERRORTEXT_psMemory_UNDERFLOW,
                    m->id);
         return 1;
@@ -252 +252 @@
     if (*(void **)((int8_t *) (m + 1) + m->userMemorySize) != P_PS_MEMMAGIC) {
         psErrorMsg(ERRORNAME_PREFIX "checkMemBlock", true, PS_ERR_MEMORY_CORRUPTION,
-                   PS_ERRORTEXT_checkMemBlock_OVERFLOW,
+                   PS_ERRORTEXT_psMemory_OVERFLOW,
                    m->id);
         return 1;