Changeset 4392 for trunk/psLib/src/sys

Timestamp:

Jun 24, 2005, 4:02:05 PM (21 years ago)

Author:

drobbin

Message:

changed psFreeFcn to psFreeFunc

Location:

trunk/psLib/src/sys

Files:

• psError.c (modified) (2 diffs)
• psErrorCodes.c (modified) (2 diffs)
• psMemory.c (modified) (3 diffs)
• psMemory.h (modified) (5 diffs)
• psTrace.c (modified) (2 diffs)

trunk/psLib/src/sys/psError.c

@@ -10 +10 @@
  *  @author Eric Van Alst, MHPCC
  *
- *  @version $Revision: 1.26 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-06-22 02:05:41 $
+ *  @version $Revision: 1.27 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-06-25 02:02:05 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -62 +62 @@
     err->code = code;
 
-    psMemSetDeallocator(err,(psFreeFcn)errFree);
+    psMemSetDeallocator(err,(psFreeFunc)errFree);
 
     return err;

trunk/psLib/src/sys/psErrorCodes.c

@@ -7 +7 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.18 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-06-17 23:44:21 $
+ *  @version $Revision: 1.19 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-06-25 02:02:05 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -105 +105 @@
     }
 
-    psMemSetDeallocator(err,(psFreeFcn)freeErrorDescription);
+    psMemSetDeallocator(err,(psFreeFunc)freeErrorDescription);
     return err;
 }

trunk/psLib/src/sys/psMemory.c

@@ -8 +8 @@
 *  @author Robert Lupton, Princeton University
 *
-*  @version $Revision: 1.54 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2005-06-20 22:42:30 $
+*  @version $Revision: 1.55 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2005-06-25 02:02:05 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -640 +640 @@
 }
 
-void psMemSetDeallocator(psPtr vptr, psFreeFcn freeFcn)
+void psMemSetDeallocator(psPtr vptr, psFreeFunc freeFcn)
 {
     if (vptr == NULL) {
@@ -655 +655 @@
 
 }
-psFreeFcn psMemGetDeallocator(psPtr vptr)
+psFreeFunc psMemGetDeallocator(psPtr vptr)
 {
     if (vptr == NULL) {

trunk/psLib/src/sys/psMemory.h

@@ -12 +12 @@
  *  @ingroup MemoryManagement
  *
- *  @version $Revision: 1.41 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-06-21 03:01:37 $
+ *  @version $Revision: 1.42 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-06-25 02:02:05 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -55 +55 @@
 
 /// typedef for deallocator.
-typedef void (*psFreeFcn) (psPtr ptr);
+typedef void (*psFreeFunc) (psPtr ptr);
 
 /** Book-keeping data for storage allocator.
@@ -67 +67 @@
     struct psMemBlock* previousBlock;  ///< previous block in allocation list
     struct psMemBlock* nextBlock;      ///< next block allocation list
-    psFreeFcn freeFcn;                 ///< deallocator.  If NULL, use generic deallocation.
+    psFreeFunc freeFcn;                 ///< deallocator.  If NULL, use generic deallocation.
     size_t userMemorySize;             ///< the size of the user-portion of the memory block
     const psMemoryId id;               ///< a unique ID for this allocation
@@ -152 +152 @@
 void psMemSetDeallocator(
     psPtr ptr,                         ///< the memory block to operate on
-    psFreeFcn freeFcn                  ///< the function to be executed at deallocation
+    psFreeFunc freeFcn                  ///< the function to be executed at deallocation
 );
 
@@ -162 +162 @@
  *  within a struct.
  *
- *  @return psFreeFcn    the routine to be called at deallocation.
- */
-psFreeFcn psMemGetDeallocator(
+ *  @return psFreeFunc    the routine to be called at deallocation.
+ */
+psFreeFunc psMemGetDeallocator(
     psPtr ptr                          ///< the memory block
 );

trunk/psLib/src/sys/psTrace.c

@@ -9 +9 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.51 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-06-21 03:01:37 $
+ *  @version $Revision: 1.52 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-06-25 02:02:05 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -67 +67 @@
 
     p_psMemSetPersistent(comp,true);
-    psMemSetDeallocator(comp, (psFreeFcn) componentFree);
+    psMemSetDeallocator(comp, (psFreeFunc) componentFree);
     comp->name = psStringCopy(name);
     p_psMemSetPersistent((psPtr)comp->name,true);