Changeset 1715
- Timestamp:
- Sep 7, 2004, 2:15:16 PM (22 years ago)
- Location:
- trunk/psLib/src
- Files:
-
- 6 edited
-
sys/psMemory.c (modified) (6 diffs)
-
sys/psString.c (modified) (2 diffs)
-
sysUtils/psMemory.c (modified) (6 diffs)
-
sysUtils/psString.c (modified) (2 diffs)
-
sysUtils/psSysUtilsErrors.dat (modified) (1 diff)
-
sysUtils/psSysUtilsErrors.h (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/psLib/src/sys/psMemory.c
r1696 r1715 9 9 * @author Robert Lupton, Princeton University 10 10 * 11 * @version $Revision: 1.3 5$ $Name: not supported by cvs2svn $12 * @date $Date: 2004-09-0 7 19:05:07$11 * @version $Revision: 1.36 $ $Name: not supported by cvs2svn $ 12 * @date $Date: 2004-09-08 00:15:16 $ 13 13 * 14 14 * Copyright 2004 Maui High Performance Computing Center, University of Hawaii … … 104 104 if (ptr->refCounter < 1) { 105 105 psErrorMsg(ERRORNAME_PREFIX "memProblemCallbackDefault", false, PS_ERR_MEMORY_CORRUPTION, 106 PS_ERRORTEXT_ memProblemCallbackDefault_MULTIPLE_FREE,106 PS_ERRORTEXT_psMemory_MULTIPLE_FREE, 107 107 ptr->id, ptr->file, ptr->lineno, file, lineno); 108 108 } … … 232 232 if (m == NULL) { 233 233 psErrorMsg(ERRORNAME_PREFIX "checkMemBlock", true, PS_ERR_MEMORY_CORRUPTION, 234 PS_ERRORTEXT_ checkMemBlock_NULL_BLOCK);234 PS_ERRORTEXT_psMemory_NULL_BLOCK); 235 235 return 1; 236 236 } … … 239 239 // using an unreferenced block of memory, are you? 240 240 psErrorMsg(ERRORNAME_PREFIX "checkMemBlock", true, PS_ERR_MEMORY_CORRUPTION, 241 PS_ERRORTEXT_ checkMemBlock_DEREF_USE,241 PS_ERRORTEXT_psMemory_DEREF_BLOCK_USE, 242 242 m->id); 243 243 return 1; … … 246 246 if (m->startblock != P_PS_MEMMAGIC || m->endblock != P_PS_MEMMAGIC) { 247 247 psErrorMsg(ERRORNAME_PREFIX "checkMemBlock", true, PS_ERR_MEMORY_CORRUPTION, 248 PS_ERRORTEXT_ checkMemBlock_UNDERFLOW,248 PS_ERRORTEXT_psMemory_UNDERFLOW, 249 249 m->id); 250 250 return 1; … … 252 252 if (*(void **)((int8_t *) (m + 1) + m->userMemorySize) != P_PS_MEMMAGIC) { 253 253 psErrorMsg(ERRORNAME_PREFIX "checkMemBlock", true, PS_ERR_MEMORY_CORRUPTION, 254 PS_ERRORTEXT_ checkMemBlock_OVERFLOW,254 PS_ERRORTEXT_psMemory_OVERFLOW, 255 255 m->id); 256 256 return 1; -
trunk/psLib/src/sys/psString.c
r1713 r1715 9 9 * @author Eric Van Alst, MHPCC 10 10 * 11 * @version $Revision: 1. 9$ $Name: not supported by cvs2svn $12 * @date $Date: 2004-09-08 00: 09:06 $11 * @version $Revision: 1.10 $ $Name: not supported by cvs2svn $ 12 * @date $Date: 2004-09-08 00:15:16 $ 13 13 * 14 14 * Copyright 2004 Maui High Performance Computing Center, University of Hawaii … … 40 40 // Log error message and return NULL 41 41 psErrorMsg(ERRORNAME_PREFIX "psStringNCopy", PS_ERR_BAD_PARAMETER_VALUE, true, 42 PS_ERRORTEXT_psString NCopy_NCHAR_NEGATIVE,42 PS_ERRORTEXT_psString_NCHAR_NEGATIVE, 43 43 nChar); 44 44 return NULL; -
trunk/psLib/src/sysUtils/psMemory.c
r1696 r1715 9 9 * @author Robert Lupton, Princeton University 10 10 * 11 * @version $Revision: 1.3 5$ $Name: not supported by cvs2svn $12 * @date $Date: 2004-09-0 7 19:05:07$11 * @version $Revision: 1.36 $ $Name: not supported by cvs2svn $ 12 * @date $Date: 2004-09-08 00:15:16 $ 13 13 * 14 14 * Copyright 2004 Maui High Performance Computing Center, University of Hawaii … … 104 104 if (ptr->refCounter < 1) { 105 105 psErrorMsg(ERRORNAME_PREFIX "memProblemCallbackDefault", false, PS_ERR_MEMORY_CORRUPTION, 106 PS_ERRORTEXT_ memProblemCallbackDefault_MULTIPLE_FREE,106 PS_ERRORTEXT_psMemory_MULTIPLE_FREE, 107 107 ptr->id, ptr->file, ptr->lineno, file, lineno); 108 108 } … … 232 232 if (m == NULL) { 233 233 psErrorMsg(ERRORNAME_PREFIX "checkMemBlock", true, PS_ERR_MEMORY_CORRUPTION, 234 PS_ERRORTEXT_ checkMemBlock_NULL_BLOCK);234 PS_ERRORTEXT_psMemory_NULL_BLOCK); 235 235 return 1; 236 236 } … … 239 239 // using an unreferenced block of memory, are you? 240 240 psErrorMsg(ERRORNAME_PREFIX "checkMemBlock", true, PS_ERR_MEMORY_CORRUPTION, 241 PS_ERRORTEXT_ checkMemBlock_DEREF_USE,241 PS_ERRORTEXT_psMemory_DEREF_BLOCK_USE, 242 242 m->id); 243 243 return 1; … … 246 246 if (m->startblock != P_PS_MEMMAGIC || m->endblock != P_PS_MEMMAGIC) { 247 247 psErrorMsg(ERRORNAME_PREFIX "checkMemBlock", true, PS_ERR_MEMORY_CORRUPTION, 248 PS_ERRORTEXT_ checkMemBlock_UNDERFLOW,248 PS_ERRORTEXT_psMemory_UNDERFLOW, 249 249 m->id); 250 250 return 1; … … 252 252 if (*(void **)((int8_t *) (m + 1) + m->userMemorySize) != P_PS_MEMMAGIC) { 253 253 psErrorMsg(ERRORNAME_PREFIX "checkMemBlock", true, PS_ERR_MEMORY_CORRUPTION, 254 PS_ERRORTEXT_ checkMemBlock_OVERFLOW,254 PS_ERRORTEXT_psMemory_OVERFLOW, 255 255 m->id); 256 256 return 1; -
trunk/psLib/src/sysUtils/psString.c
r1713 r1715 9 9 * @author Eric Van Alst, MHPCC 10 10 * 11 * @version $Revision: 1. 9$ $Name: not supported by cvs2svn $12 * @date $Date: 2004-09-08 00: 09:06 $11 * @version $Revision: 1.10 $ $Name: not supported by cvs2svn $ 12 * @date $Date: 2004-09-08 00:15:16 $ 13 13 * 14 14 * Copyright 2004 Maui High Performance Computing Center, University of Hawaii … … 40 40 // Log error message and return NULL 41 41 psErrorMsg(ERRORNAME_PREFIX "psStringNCopy", PS_ERR_BAD_PARAMETER_VALUE, true, 42 PS_ERRORTEXT_psString NCopy_NCHAR_NEGATIVE,42 PS_ERRORTEXT_psString_NCHAR_NEGATIVE, 43 43 nChar); 44 44 return NULL; -
trunk/psLib/src/sysUtils/psSysUtilsErrors.dat
r1713 r1715 17 17 # Error Messages from psMemory.c: 18 18 # 19 checkMemBlock_NULL_BLOCKNULL memory block found.20 checkMemBlock_DEREF_USEMemory block %ld was freed but still used.21 checkMemBlock_UNDERFLOWMemory block %ld is corrupted; buffer underflow detected.22 checkMemBlock_OVERFLOWMemory block %ld is corrupted; buffer overflow detected.23 memProblemCallbackDefault_MULTIPLE_FREEBlock %ld allocated at %s:%d freed more than once at %s:%d.19 psMemory_NULL_BLOCK NULL memory block found. 20 psMemory_DEREF_BLOCK_USE Memory block %ld was freed but still used. 21 psMemory_UNDERFLOW Memory block %ld is corrupted; buffer underflow detected. 22 psMemory_OVERFLOW Memory block %ld is corrupted; buffer overflow detected. 23 psMemory_MULTIPLE_FREE Block %ld allocated at %s:%d freed more than once at %s:%d. 24 24 # 25 25 # Error Messages from psString.c: -
trunk/psLib/src/sysUtils/psSysUtilsErrors.h
r1713 r1715 7 7 * @author Robert DeSonia, MHPCC 8 8 * 9 * @version $Revision: 1. 2$ $Name: not supported by cvs2svn $10 * @date $Date: 2004-09-08 00: 09:06 $9 * @version $Revision: 1.3 $ $Name: not supported by cvs2svn $ 10 * @date $Date: 2004-09-08 00:15:16 $ 11 11 * 12 12 * Copyright 2004 Maui High Performance Computing Center, University of Hawaii … … 35 35 #define PS_ERRORTEXT_psLogSetDestination_UNSUPPORTED_PROTOCOL "Do not know how to handle the protocol '%s'." 36 36 #define PS_ERRORTEXT_psLogSetFormat_UNKNOWN_KEY "Unknown logging keyword %c." 37 #define PS_ERRORTEXT_ checkMemBlock_NULL_BLOCK "NULL memory block found."38 #define PS_ERRORTEXT_ checkMemBlock_DEREF_USE "Memory block %ld was freed but still used."39 #define PS_ERRORTEXT_ checkMemBlock_UNDERFLOW "Memory block %ld is corrupted; buffer underflow detected."40 #define PS_ERRORTEXT_ checkMemBlock_OVERFLOW "Memory block %ld is corrupted; buffer overflow detected."41 #define PS_ERRORTEXT_ memProblemCallbackDefault_MULTIPLE_FREE "Block %ld allocated at %s:%d freed more than once at %s:%d."37 #define PS_ERRORTEXT_psMemory_NULL_BLOCK "NULL memory block found." 38 #define PS_ERRORTEXT_psMemory_DEREF_BLOCK_USE "Memory block %ld was freed but still used." 39 #define PS_ERRORTEXT_psMemory_UNDERFLOW "Memory block %ld is corrupted; buffer underflow detected." 40 #define PS_ERRORTEXT_psMemory_OVERFLOW "Memory block %ld is corrupted; buffer overflow detected." 41 #define PS_ERRORTEXT_psMemory_MULTIPLE_FREE "Block %ld allocated at %s:%d freed more than once at %s:%d." 42 42 #define PS_ERRORTEXT_psString_NCHAR_NEGATIVE "Can not copy a negative number of characters (%d)." 43 43 #define PS_ERRORTEXT_psTrace_NULL_SUBCOMPONENT "Sub-component %d of node %s in trace tree is NULL."
Note:
See TracChangeset
for help on using the changeset viewer.
