Changeset 8232 for trunk/psLib/src/sys/psMemory.c

Timestamp:

Aug 8, 2006, 1:32:23 PM (20 years ago)

Author:

jhoblitt

Message:

bug #790 - remove psErrorText.h and inline all error codes. all newly inlined error codes are wrapped with the _() macro from future gettextification

Location:

trunk/psLib/src

Files:

• . (modified) (1 prop)
• sys/psMemory.c (modified) (8 diffs)

trunk/psLib/src

@@ -10 +10 @@
 libpslib.la.temp
 config.h.in
-psErrorText.h
 *.bb
 *.bbg

@@ -10 +10 @@
 libpslib.la.temp
 config.h.in
-psErrorText.h
 *.bb
 *.bbg

trunk/psLib/src/sys/psMemory.c

@@ -8 +8 @@
 *  @author Robert Lupton, Princeton University
 *
-*  @version $Revision: 1.74 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2006-07-14 02:26:25 $
+*  @version $Revision: 1.75 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2006-08-08 23:32:23 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -33 +33 @@
 #include "psLine.h"
 #include "psRegion.h"
-#include "psErrorText.h"
+
 
 #define P_PS_MEMMAGIC (psPtr )0xdeadbeef   // Magic number in psMemBlock header
@@ -126 +126 @@
     if (ptr->refCounter < 1) {
         psError(PS_ERR_MEMORY_CORRUPTION, false,
-                PS_ERRORTEXT_psMemory_MULTIPLE_FREE,
+                _("Block %lu, allocated at %s:%d, freed multiple times at %s:%d."),
                 (unsigned long)ptr->id, ptr->file, ptr->lineno, file, lineno);
     }
@@ -148 +148 @@
     if (m == NULL) {
         psError(PS_ERR_MEMORY_CORRUPTION, true,
-                PS_ERRORTEXT_psMemory_NULL_BLOCK);
+                _("NULL memory block found."));
         return 1;
     }
@@ -155 +155 @@
         // using an unreferenced block of memory, are you?
         psError(PS_ERR_MEMORY_CORRUPTION, true,
-                PS_ERRORTEXT_psMemory_DEREF_BLOCK_USE,
+                _("Memory block %lu was freed but still being used."),
                 (unsigned long)m->id);
         return 1;
@@ -162 +162 @@
     if (m->startblock != P_PS_MEMMAGIC || m->endblock != P_PS_MEMMAGIC) {
         psError(PS_ERR_MEMORY_CORRUPTION, true,
-                PS_ERRORTEXT_psMemory_UNDERFLOW,
+                _("Memory block %lu is corrupted; buffer underflow detected."),
                 (unsigned long)m->id);
         return 1;
@@ -168 +168 @@
     if (*(psPtr *)((int8_t *) (m + 1) + m->userMemorySize) != P_PS_MEMMAGIC) {
         psError(PS_ERR_MEMORY_CORRUPTION, true,
-                PS_ERRORTEXT_psMemory_OVERFLOW,
+                _("Memory block %lu is corrupted; buffer overflow detected."),
                 (unsigned long)m->id);
         return 1;
@@ -506 +506 @@
         psMemBlock* ptr = ((psMemBlock* ) vptr) - 1;
 
-        psAbort(__func__,PS_ERRORTEXT_psMemory_MULTIPLE_FREE,
+        psAbort(__func__,_("Block %lu, allocated at %s:%d, freed multiple times at %s:%d."),
                 (unsigned long)ptr->id, ptr->file, ptr->lineno, filename, lineno);
     }

@@ -10 +10 @@
 libpslib.la.temp
 config.h.in
-psErrorText.h
 *.bb
 *.bbg