Changeset 26892 for trunk/psLib/src/sys

Timestamp:

Feb 10, 2010, 7:27:29 PM (16 years ago)

Author:

eugene

Message:

updates from eam_branches/20091201

Location:

trunk/psLib/src/sys

Files:

• psErrorCodes.c.in (modified) (1 diff)
• psMemory.h (modified) (2 diffs)
• psTrace.c (modified) (1 diff)

trunk/psLib/src/sys/psErrorCodes.c.in

@@ -67 +67 @@
 static void freeErrorDescription(psErrorDescription* err)
 {
-    psFree((void *)err->description);
+    psFree(err->description);
 }
 

trunk/psLib/src/sys/psMemory.h

@@ -326 +326 @@
 
 /** Free memory.  This operates much like free().
- *
+ *  
  *  @see psAlloc, psRealloc
+ *  note: we cast ptr to (void *) in case we are supplied a const pointer.
  */
 #ifdef DOXYGEN
@@ -336 +337 @@
 #ifndef SWIG
 #define psFree(ptr) \
-        psMemDecrRefCounter(ptr)
+    ptr = psMemDecrRefCounter((void *)ptr);
 #endif // ifndef SWIG
 #endif // ifdef DOXYGEN

trunk/psLib/src/sys/psTrace.c

@@ -119 +119 @@
 
     psMemSetPersistent((psPtr)comp->name,false);
-    psFree((void *)comp->name);
+    psFree(comp->name);
 }