Index: /trunk/psLib/src/astro/psCoord.c
===================================================================
--- /trunk/psLib/src/astro/psCoord.c	(revision 4391)
+++ /trunk/psLib/src/astro/psCoord.c	(revision 4392)
@@ -10,6 +10,6 @@
 *  @author GLG, MHPCC
 *
-*  @version $Revision: 1.76 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2005-06-21 03:01:37 $
+*  @version $Revision: 1.77 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2005-06-25 02:02:04 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -197,5 +197,5 @@
     psPlane *p = psAlloc(sizeof(psPlane));
 
-    psMemSetDeallocator(p, (psFreeFcn) planeFree);
+    psMemSetDeallocator(p, (psFreeFunc) planeFree);
     return(p);
 }
@@ -211,5 +211,5 @@
     psSphere *s = psAlloc(sizeof(psSphere));
 
-    psMemSetDeallocator(s, (psFreeFcn) sphereFree);
+    psMemSetDeallocator(s, (psFreeFunc) sphereFree);
     return(s);
 }
@@ -230,5 +230,5 @@
     pt->y = psDPolynomial2DAlloc(n1, n2, PS_POLYNOMIAL_ORD);
 
-    psMemSetDeallocator(pt, (psFreeFcn) planeTransformFree);
+    psMemSetDeallocator(pt, (psFreeFunc) planeTransformFree);
     return(pt);
 }
@@ -279,5 +279,5 @@
     pt->y = psDPolynomial4DAlloc(n1, n2, n3, n4, PS_POLYNOMIAL_ORD);
 
-    psMemSetDeallocator(pt, (psFreeFcn) planeDistortFree);
+    psMemSetDeallocator(pt, (psFreeFunc) planeDistortFree);
     return(pt);
 }
@@ -494,5 +494,5 @@
     p->type = type;
 
-    psMemSetDeallocator(p, (psFreeFcn) projectionFree);
+    psMemSetDeallocator(p, (psFreeFunc) projectionFree);
     return(p);
 }
Index: /trunk/psLib/src/astronomy/psAstrometry.c
===================================================================
--- /trunk/psLib/src/astronomy/psAstrometry.c	(revision 4391)
+++ /trunk/psLib/src/astronomy/psAstrometry.c	(revision 4392)
@@ -8,6 +8,6 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.69 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-06-17 23:44:21 $
+ *  @version $Revision: 1.70 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-06-25 02:02:04 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -189,5 +189,5 @@
     }
 
-    psMemSetDeallocator(tmp,(psFreeFcn)fixedPatternFree);
+    psMemSetDeallocator(tmp,(psFreeFunc)fixedPatternFree);
 
     return(tmp);
@@ -236,5 +236,5 @@
     exp->telescopeName = NULL;
 
-    psMemSetDeallocator(exp,(psFreeFcn)exposureFree);
+    psMemSetDeallocator(exp,(psFreeFunc)exposureFree);
 
     return exp;
@@ -261,5 +261,5 @@
     *(double *)&obs->tlr = tlr;
 
-    psMemSetDeallocator(obs,(psFreeFcn)observatoryFree);
+    psMemSetDeallocator(obs,(psFreeFunc)observatoryFree);
 
     return obs;
@@ -302,5 +302,5 @@
     newFPA->chi2 = 0.0f;
 
-    psMemSetDeallocator(newFPA,(psFreeFcn)FPAFree);
+    psMemSetDeallocator(newFPA,(psFreeFunc)FPAFree);
 
     return newFPA;
@@ -336,5 +336,5 @@
     chip->parent = parentFPA;
 
-    psMemSetDeallocator(chip,(psFreeFcn)chipFree);
+    psMemSetDeallocator(chip,(psFreeFunc)chipFree);
 
     return chip;
@@ -374,5 +374,5 @@
     cell->parent = parentChip;
 
-    psMemSetDeallocator(cell,(psFreeFcn)cellFree);
+    psMemSetDeallocator(cell,(psFreeFunc)cellFree);
 
     return cell;
@@ -397,5 +397,5 @@
     readout->metadata = NULL;
 
-    psMemSetDeallocator(readout,(psFreeFcn)readoutFree);
+    psMemSetDeallocator(readout,(psFreeFunc)readoutFree);
 
     return readout;
Index: /trunk/psLib/src/astronomy/psCoord.c
===================================================================
--- /trunk/psLib/src/astronomy/psCoord.c	(revision 4391)
+++ /trunk/psLib/src/astronomy/psCoord.c	(revision 4392)
@@ -10,6 +10,6 @@
 *  @author GLG, MHPCC
 *
-*  @version $Revision: 1.76 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2005-06-21 03:01:37 $
+*  @version $Revision: 1.77 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2005-06-25 02:02:04 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -197,5 +197,5 @@
     psPlane *p = psAlloc(sizeof(psPlane));
 
-    psMemSetDeallocator(p, (psFreeFcn) planeFree);
+    psMemSetDeallocator(p, (psFreeFunc) planeFree);
     return(p);
 }
@@ -211,5 +211,5 @@
     psSphere *s = psAlloc(sizeof(psSphere));
 
-    psMemSetDeallocator(s, (psFreeFcn) sphereFree);
+    psMemSetDeallocator(s, (psFreeFunc) sphereFree);
     return(s);
 }
@@ -230,5 +230,5 @@
     pt->y = psDPolynomial2DAlloc(n1, n2, PS_POLYNOMIAL_ORD);
 
-    psMemSetDeallocator(pt, (psFreeFcn) planeTransformFree);
+    psMemSetDeallocator(pt, (psFreeFunc) planeTransformFree);
     return(pt);
 }
@@ -279,5 +279,5 @@
     pt->y = psDPolynomial4DAlloc(n1, n2, n3, n4, PS_POLYNOMIAL_ORD);
 
-    psMemSetDeallocator(pt, (psFreeFcn) planeDistortFree);
+    psMemSetDeallocator(pt, (psFreeFunc) planeDistortFree);
     return(pt);
 }
@@ -494,5 +494,5 @@
     p->type = type;
 
-    psMemSetDeallocator(p, (psFreeFcn) projectionFree);
+    psMemSetDeallocator(p, (psFreeFunc) projectionFree);
     return(p);
 }
Index: /trunk/psLib/src/collections/psArray.c
===================================================================
--- /trunk/psLib/src/collections/psArray.c	(revision 4391)
+++ /trunk/psLib/src/collections/psArray.c	(revision 4392)
@@ -9,6 +9,6 @@
  *  @author Ross Harman, MHPCC
  *
- *  @version $Revision: 1.31 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-06-23 03:50:29 $
+ *  @version $Revision: 1.32 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-06-25 02:02:04 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -55,5 +55,5 @@
     // Create vector struct
     psArr = (psArray* ) psAlloc(sizeof(psArray));
-    psMemSetDeallocator(psArr, (psFreeFcn) arrayFree);
+    psMemSetDeallocator(psArr, (psFreeFunc) arrayFree);
 
     psArr->nalloc = nalloc;
Index: /trunk/psLib/src/collections/psBitSet.c
===================================================================
--- /trunk/psLib/src/collections/psBitSet.c	(revision 4391)
+++ /trunk/psLib/src/collections/psBitSet.c	(revision 4392)
@@ -11,6 +11,6 @@
  *  @author Robert DeSonia, 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
@@ -80,5 +80,5 @@
     numBytes = ceil(nalloc / 8.0);
     newObj = psAlloc(sizeof(psBitSet));
-    psMemSetDeallocator(newObj, (psFreeFcn) bitSetFree);
+    psMemSetDeallocator(newObj, (psFreeFunc) bitSetFree);
     newObj->n = numBytes;
 
Index: /trunk/psLib/src/collections/psHash.c
===================================================================
--- /trunk/psLib/src/collections/psHash.c	(revision 4391)
+++ /trunk/psLib/src/collections/psHash.c	(revision 4392)
@@ -12,6 +12,6 @@
 *  @author GLG, MHPCC
 *
-*  @version $Revision: 1.20 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2005-06-22 23:48:39 $
+*  @version $Revision: 1.21 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2005-06-25 02:02:05 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -91,5 +91,5 @@
     psHashBucket* bucket = psAlloc(sizeof(psHashBucket));
 
-    psMemSetDeallocator(bucket, (psFreeFcn) hashBucketFree);
+    psMemSetDeallocator(bucket, (psFreeFunc) hashBucketFree);
 
     // Initialize the bucket.
@@ -142,5 +142,5 @@
     psHash* table = psAlloc(sizeof(psHash));
 
-    psMemSetDeallocator(table, (psFreeFcn) hashFree);
+    psMemSetDeallocator(table, (psFreeFunc) hashFree);
 
     // Allocate memory for the buckets.
Index: /trunk/psLib/src/collections/psList.c
===================================================================
--- /trunk/psLib/src/collections/psList.c	(revision 4391)
+++ /trunk/psLib/src/collections/psList.c	(revision 4392)
@@ -6,6 +6,6 @@
  *  @author Robert Daniel DeSonia, MHPCC
  *
- *  @version $Revision: 1.38 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-06-23 03:50:29 $
+ *  @version $Revision: 1.39 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-06-25 02:02:05 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -129,5 +129,5 @@
     psList* list = psAlloc(sizeof(psList));
 
-    psMemSetDeallocator(list, (psFreeFcn) listFree);
+    psMemSetDeallocator(list, (psFreeFunc) listFree);
 
     list->size = 0;
@@ -153,5 +153,5 @@
     psListIterator* iter = psAlloc(sizeof(psListIterator));
 
-    psMemSetDeallocator(iter, (psFreeFcn) listIteratorFree);
+    psMemSetDeallocator(iter, (psFreeFunc) listIteratorFree);
 
     // initialize the attributes
Index: /trunk/psLib/src/collections/psMetadata.c
===================================================================
--- /trunk/psLib/src/collections/psMetadata.c	(revision 4391)
+++ /trunk/psLib/src/collections/psMetadata.c	(revision 4392)
@@ -12,6 +12,6 @@
 *  @author Ross Harman, MHPCC
 *
-*  @version $Revision: 1.67 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2005-06-24 01:44:18 $
+*  @version $Revision: 1.68 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2005-06-25 02:02:05 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -186,5 +186,5 @@
 
     // Set deallocator
-    psMemSetDeallocator(metadataItem, (psFreeFcn) metadataItemFree);
+    psMemSetDeallocator(metadataItem, (psFreeFunc) metadataItemFree);
 
     // Allocate and set metadata item comment
@@ -256,5 +256,5 @@
     metadata = (psMetadata*) psAlloc(sizeof(psMetadata));
     // Set deallocator
-    psMemSetDeallocator(metadata, (psFreeFcn) metadataFree);
+    psMemSetDeallocator(metadata, (psFreeFunc) metadataFree);
 
     // Allocate metadata's internal containers
@@ -608,5 +608,5 @@
 
     // Set deallocator
-    psMemSetDeallocator(newIter, (psFreeFcn) metadataIteratorFree);
+    psMemSetDeallocator(newIter, (psFreeFunc) metadataIteratorFree);
 
     if (regex == NULL) {
Index: /trunk/psLib/src/collections/psMetadataIO.c
===================================================================
--- /trunk/psLib/src/collections/psMetadataIO.c	(revision 4391)
+++ /trunk/psLib/src/collections/psMetadataIO.c	(revision 4392)
@@ -10,6 +10,6 @@
 *  @author Eric Van Alst, MHPCC
 *
-*  @version $Revision: 1.30 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2005-06-10 18:09:12 $
+*  @version $Revision: 1.31 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2005-06-25 02:02:05 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -358,5 +358,5 @@
 
         // Set memory deallocator
-        psMemSetDeallocator(info,(psFreeFcn)parseLevelInfoFree);
+        psMemSetDeallocator(info,(psFreeFunc)parseLevelInfoFree);
     }
     return info;
Index: /trunk/psLib/src/collections/psPixels.c
===================================================================
--- /trunk/psLib/src/collections/psPixels.c	(revision 4391)
+++ /trunk/psLib/src/collections/psPixels.c	(revision 4392)
@@ -7,6 +7,6 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.10 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-06-20 22:42:29 $
+ *  @version $Revision: 1.11 $ $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,5 +67,5 @@
     out->nalloc = size;
 
-    psMemSetDeallocator(out, (psFreeFcn)pixelsFree);
+    psMemSetDeallocator(out, (psFreeFunc)pixelsFree);
 
     return out;
Index: /trunk/psLib/src/collections/psVector.c
===================================================================
--- /trunk/psLib/src/collections/psVector.c	(revision 4391)
+++ /trunk/psLib/src/collections/psVector.c	(revision 4392)
@@ -9,6 +9,6 @@
 *  @author Robert DeSonia, MHPCC
 *
-*  @version $Revision: 1.43 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2005-06-21 03:01:37 $
+*  @version $Revision: 1.44 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2005-06-25 02:02:05 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -63,5 +63,5 @@
     // Create vector struct
     psVec = (psVector* ) psAlloc(sizeof(psVector));
-    psMemSetDeallocator(psVec, (psFreeFcn) vectorFree);
+    psMemSetDeallocator(psVec, (psFreeFunc) vectorFree);
 
     psVec->type.dimen = PS_DIMEN_VECTOR;
Index: /trunk/psLib/src/dataIO/psFits.c
===================================================================
--- /trunk/psLib/src/dataIO/psFits.c	(revision 4391)
+++ /trunk/psLib/src/dataIO/psFits.c	(revision 4392)
@@ -7,6 +7,6 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.38 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-06-22 03:00:27 $
+ *  @version $Revision: 1.39 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-06-25 02:02:05 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -249,5 +249,5 @@
     fits->p_fd = fptr;
     strcpy((char*)fits->filename,name);
-    psMemSetDeallocator(fits,(psFreeFcn)fitsFree);
+    psMemSetDeallocator(fits,(psFreeFunc)fitsFree);
 
     return fits;
Index: /trunk/psLib/src/dataIO/psLookupTable.c
===================================================================
--- /trunk/psLib/src/dataIO/psLookupTable.c	(revision 4391)
+++ /trunk/psLib/src/dataIO/psLookupTable.c	(revision 4392)
@@ -7,6 +7,6 @@
 *  @author Ross Harman, MHPCC
 *
-*  @version $Revision: 1.20 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2005-06-23 03:19:29 $
+*  @version $Revision: 1.21 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2005-06-25 02:02:05 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, Univ. of Hawaii
@@ -268,5 +268,5 @@
 
     // Set deallocator
-    psMemSetDeallocator(outTable, (psFreeFcn)lookupTableFree);
+    psMemSetDeallocator(outTable, (psFreeFunc)lookupTableFree);
 
     // Allocate and set file name and format strings
Index: /trunk/psLib/src/dataManip/psFunctions.c
===================================================================
--- /trunk/psLib/src/dataManip/psFunctions.c	(revision 4391)
+++ /trunk/psLib/src/dataManip/psFunctions.c	(revision 4392)
@@ -7,6 +7,6 @@
  *  polynomials.  It also contains a Gaussian functions.
  *
- *  @version $Revision: 1.110 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-06-21 03:01:37 $
+ *  @version $Revision: 1.111 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-06-25 02:02:05 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -1078,5 +1078,5 @@
 
     newPoly = (psPolynomial1D* ) psAlloc(sizeof(psPolynomial1D));
-    psMemSetDeallocator(newPoly, (psFreeFcn) polynomial1DFree);
+    psMemSetDeallocator(newPoly, (psFreeFunc) polynomial1DFree);
 
     newPoly->type = type;
@@ -1105,5 +1105,5 @@
 
     newPoly = (psPolynomial2D* ) psAlloc(sizeof(psPolynomial2D));
-    psMemSetDeallocator(newPoly, (psFreeFcn) polynomial2DFree);
+    psMemSetDeallocator(newPoly, (psFreeFunc) polynomial2DFree);
 
     newPoly->type = type;
@@ -1143,5 +1143,5 @@
 
     newPoly = (psPolynomial3D* ) psAlloc(sizeof(psPolynomial3D));
-    psMemSetDeallocator(newPoly, (psFreeFcn) polynomial3DFree);
+    psMemSetDeallocator(newPoly, (psFreeFunc) polynomial3DFree);
 
     newPoly->type = type;
@@ -1191,5 +1191,5 @@
 
     newPoly = (psPolynomial4D* ) psAlloc(sizeof(psPolynomial4D));
-    psMemSetDeallocator(newPoly, (psFreeFcn) polynomial4DFree);
+    psMemSetDeallocator(newPoly, (psFreeFunc) polynomial4DFree);
 
     newPoly->type = type;
@@ -1440,5 +1440,5 @@
 
     newPoly = (psDPolynomial1D* ) psAlloc(sizeof(psDPolynomial1D));
-    psMemSetDeallocator(newPoly, (psFreeFcn) dPolynomial1DFree);
+    psMemSetDeallocator(newPoly, (psFreeFunc) dPolynomial1DFree);
 
     newPoly->type = type;
@@ -1467,5 +1467,5 @@
 
     newPoly = (psDPolynomial2D* ) psAlloc(sizeof(psDPolynomial2D));
-    psMemSetDeallocator(newPoly, (psFreeFcn) dPolynomial2DFree);
+    psMemSetDeallocator(newPoly, (psFreeFunc) dPolynomial2DFree);
 
     newPoly->type = type;
@@ -1505,5 +1505,5 @@
 
     newPoly = (psDPolynomial3D* ) psAlloc(sizeof(psDPolynomial3D));
-    psMemSetDeallocator(newPoly, (psFreeFcn) dPolynomial3DFree);
+    psMemSetDeallocator(newPoly, (psFreeFunc) dPolynomial3DFree);
 
     newPoly->type = type;
@@ -1553,5 +1553,5 @@
 
     newPoly = (psDPolynomial4D* ) psAlloc(sizeof(psDPolynomial4D));
-    psMemSetDeallocator(newPoly, (psFreeFcn) dPolynomial4DFree);
+    psMemSetDeallocator(newPoly, (psFreeFunc) dPolynomial4DFree);
 
     newPoly->type = type;
@@ -1858,5 +1858,5 @@
     tmp->knots->data.F32[numSplines] = max;
 
-    psMemSetDeallocator(tmp,(psFreeFcn)spline1DFree);
+    psMemSetDeallocator(tmp,(psFreeFunc)spline1DFree);
     return(tmp);
 }
@@ -1901,5 +1901,5 @@
     }
 
-    psMemSetDeallocator(tmp,(psFreeFcn)spline1DFree);
+    psMemSetDeallocator(tmp,(psFreeFunc)spline1DFree);
     return(tmp);
 }
Index: /trunk/psLib/src/dataManip/psStats.c
===================================================================
--- /trunk/psLib/src/dataManip/psStats.c	(revision 4391)
+++ /trunk/psLib/src/dataManip/psStats.c	(revision 4392)
@@ -14,6 +14,6 @@
  *      stats->binsize
  *
- *  @version $Revision: 1.134 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-06-18 02:30:49 $
+ *  @version $Revision: 1.135 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-06-25 02:02:05 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -1810,5 +1810,5 @@
     // bins, then there are N+1 bounds to those bins.
     newHist = (psHistogram* ) psAlloc(sizeof(psHistogram));
-    psMemSetDeallocator(newHist, (psFreeFcn) histogramFree);
+    psMemSetDeallocator(newHist, (psFreeFunc) histogramFree);
     newHist->bounds = psVectorAlloc(n + 1, PS_TYPE_F32);
     newHist->bounds->n = newHist->bounds->nalloc;
@@ -1857,5 +1857,5 @@
     // Allocate memory for the new histogram structure.
     newHist = (psHistogram* ) psAlloc(sizeof(psHistogram));
-    psMemSetDeallocator(newHist, (psFreeFcn) histogramFree);
+    psMemSetDeallocator(newHist, (psFreeFunc) histogramFree);
     newHist->bounds = psVectorAlloc(bounds->n, PS_TYPE_F32);
     newHist->bounds->n = newHist->bounds->nalloc;
Index: /trunk/psLib/src/fits/psFits.c
===================================================================
--- /trunk/psLib/src/fits/psFits.c	(revision 4391)
+++ /trunk/psLib/src/fits/psFits.c	(revision 4392)
@@ -7,6 +7,6 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.38 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-06-22 03:00:27 $
+ *  @version $Revision: 1.39 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-06-25 02:02:05 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -249,5 +249,5 @@
     fits->p_fd = fptr;
     strcpy((char*)fits->filename,name);
-    psMemSetDeallocator(fits,(psFreeFcn)fitsFree);
+    psMemSetDeallocator(fits,(psFreeFunc)fitsFree);
 
     return fits;
Index: /trunk/psLib/src/image/psImage.c
===================================================================
--- /trunk/psLib/src/image/psImage.c	(revision 4391)
+++ /trunk/psLib/src/image/psImage.c	(revision 4392)
@@ -9,6 +9,6 @@
  *  @author Ross Harman, MHPCC
  *
- *  @version $Revision: 1.70 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-06-21 03:01:37 $
+ *  @version $Revision: 1.71 $ $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,5 +67,5 @@
     psImage* image = (psImage* ) psAlloc(sizeof(psImage));
 
-    psMemSetDeallocator(image, (psFreeFcn) imageFree);
+    psMemSetDeallocator(image, (psFreeFunc) imageFree);
 
     image->data.V = psAlloc(sizeof(psPtr ) * numRows);
Index: /trunk/psLib/src/image/psImageConvolve.c
===================================================================
--- /trunk/psLib/src/image/psImageConvolve.c	(revision 4391)
+++ /trunk/psLib/src/image/psImageConvolve.c	(revision 4392)
@@ -5,6 +5,6 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.19 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-06-18 03:13:02 $
+ *  @version $Revision: 1.20 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-06-25 02:02:05 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -74,5 +74,5 @@
     result->kernel = kernelRows - yMin;
 
-    psMemSetDeallocator(result,(psFreeFcn)freeKernel);
+    psMemSetDeallocator(result,(psFreeFunc)freeKernel);
 
     return result;
Index: /trunk/psLib/src/imageops/psImageConvolve.c
===================================================================
--- /trunk/psLib/src/imageops/psImageConvolve.c	(revision 4391)
+++ /trunk/psLib/src/imageops/psImageConvolve.c	(revision 4392)
@@ -5,6 +5,6 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.19 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-06-18 03:13:02 $
+ *  @version $Revision: 1.20 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-06-25 02:02:05 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -74,5 +74,5 @@
     result->kernel = kernelRows - yMin;
 
-    psMemSetDeallocator(result,(psFreeFcn)freeKernel);
+    psMemSetDeallocator(result,(psFreeFunc)freeKernel);
 
     return result;
Index: /trunk/psLib/src/math/psPolynomial.c
===================================================================
--- /trunk/psLib/src/math/psPolynomial.c	(revision 4391)
+++ /trunk/psLib/src/math/psPolynomial.c	(revision 4392)
@@ -7,6 +7,6 @@
  *  polynomials.  It also contains a Gaussian functions.
  *
- *  @version $Revision: 1.110 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-06-21 03:01:37 $
+ *  @version $Revision: 1.111 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-06-25 02:02:05 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -1078,5 +1078,5 @@
 
     newPoly = (psPolynomial1D* ) psAlloc(sizeof(psPolynomial1D));
-    psMemSetDeallocator(newPoly, (psFreeFcn) polynomial1DFree);
+    psMemSetDeallocator(newPoly, (psFreeFunc) polynomial1DFree);
 
     newPoly->type = type;
@@ -1105,5 +1105,5 @@
 
     newPoly = (psPolynomial2D* ) psAlloc(sizeof(psPolynomial2D));
-    psMemSetDeallocator(newPoly, (psFreeFcn) polynomial2DFree);
+    psMemSetDeallocator(newPoly, (psFreeFunc) polynomial2DFree);
 
     newPoly->type = type;
@@ -1143,5 +1143,5 @@
 
     newPoly = (psPolynomial3D* ) psAlloc(sizeof(psPolynomial3D));
-    psMemSetDeallocator(newPoly, (psFreeFcn) polynomial3DFree);
+    psMemSetDeallocator(newPoly, (psFreeFunc) polynomial3DFree);
 
     newPoly->type = type;
@@ -1191,5 +1191,5 @@
 
     newPoly = (psPolynomial4D* ) psAlloc(sizeof(psPolynomial4D));
-    psMemSetDeallocator(newPoly, (psFreeFcn) polynomial4DFree);
+    psMemSetDeallocator(newPoly, (psFreeFunc) polynomial4DFree);
 
     newPoly->type = type;
@@ -1440,5 +1440,5 @@
 
     newPoly = (psDPolynomial1D* ) psAlloc(sizeof(psDPolynomial1D));
-    psMemSetDeallocator(newPoly, (psFreeFcn) dPolynomial1DFree);
+    psMemSetDeallocator(newPoly, (psFreeFunc) dPolynomial1DFree);
 
     newPoly->type = type;
@@ -1467,5 +1467,5 @@
 
     newPoly = (psDPolynomial2D* ) psAlloc(sizeof(psDPolynomial2D));
-    psMemSetDeallocator(newPoly, (psFreeFcn) dPolynomial2DFree);
+    psMemSetDeallocator(newPoly, (psFreeFunc) dPolynomial2DFree);
 
     newPoly->type = type;
@@ -1505,5 +1505,5 @@
 
     newPoly = (psDPolynomial3D* ) psAlloc(sizeof(psDPolynomial3D));
-    psMemSetDeallocator(newPoly, (psFreeFcn) dPolynomial3DFree);
+    psMemSetDeallocator(newPoly, (psFreeFunc) dPolynomial3DFree);
 
     newPoly->type = type;
@@ -1553,5 +1553,5 @@
 
     newPoly = (psDPolynomial4D* ) psAlloc(sizeof(psDPolynomial4D));
-    psMemSetDeallocator(newPoly, (psFreeFcn) dPolynomial4DFree);
+    psMemSetDeallocator(newPoly, (psFreeFunc) dPolynomial4DFree);
 
     newPoly->type = type;
@@ -1858,5 +1858,5 @@
     tmp->knots->data.F32[numSplines] = max;
 
-    psMemSetDeallocator(tmp,(psFreeFcn)spline1DFree);
+    psMemSetDeallocator(tmp,(psFreeFunc)spline1DFree);
     return(tmp);
 }
@@ -1901,5 +1901,5 @@
     }
 
-    psMemSetDeallocator(tmp,(psFreeFcn)spline1DFree);
+    psMemSetDeallocator(tmp,(psFreeFunc)spline1DFree);
     return(tmp);
 }
Index: /trunk/psLib/src/math/psSpline.c
===================================================================
--- /trunk/psLib/src/math/psSpline.c	(revision 4391)
+++ /trunk/psLib/src/math/psSpline.c	(revision 4392)
@@ -7,6 +7,6 @@
  *  polynomials.  It also contains a Gaussian functions.
  *
- *  @version $Revision: 1.110 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-06-21 03:01:37 $
+ *  @version $Revision: 1.111 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-06-25 02:02:05 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -1078,5 +1078,5 @@
 
     newPoly = (psPolynomial1D* ) psAlloc(sizeof(psPolynomial1D));
-    psMemSetDeallocator(newPoly, (psFreeFcn) polynomial1DFree);
+    psMemSetDeallocator(newPoly, (psFreeFunc) polynomial1DFree);
 
     newPoly->type = type;
@@ -1105,5 +1105,5 @@
 
     newPoly = (psPolynomial2D* ) psAlloc(sizeof(psPolynomial2D));
-    psMemSetDeallocator(newPoly, (psFreeFcn) polynomial2DFree);
+    psMemSetDeallocator(newPoly, (psFreeFunc) polynomial2DFree);
 
     newPoly->type = type;
@@ -1143,5 +1143,5 @@
 
     newPoly = (psPolynomial3D* ) psAlloc(sizeof(psPolynomial3D));
-    psMemSetDeallocator(newPoly, (psFreeFcn) polynomial3DFree);
+    psMemSetDeallocator(newPoly, (psFreeFunc) polynomial3DFree);
 
     newPoly->type = type;
@@ -1191,5 +1191,5 @@
 
     newPoly = (psPolynomial4D* ) psAlloc(sizeof(psPolynomial4D));
-    psMemSetDeallocator(newPoly, (psFreeFcn) polynomial4DFree);
+    psMemSetDeallocator(newPoly, (psFreeFunc) polynomial4DFree);
 
     newPoly->type = type;
@@ -1440,5 +1440,5 @@
 
     newPoly = (psDPolynomial1D* ) psAlloc(sizeof(psDPolynomial1D));
-    psMemSetDeallocator(newPoly, (psFreeFcn) dPolynomial1DFree);
+    psMemSetDeallocator(newPoly, (psFreeFunc) dPolynomial1DFree);
 
     newPoly->type = type;
@@ -1467,5 +1467,5 @@
 
     newPoly = (psDPolynomial2D* ) psAlloc(sizeof(psDPolynomial2D));
-    psMemSetDeallocator(newPoly, (psFreeFcn) dPolynomial2DFree);
+    psMemSetDeallocator(newPoly, (psFreeFunc) dPolynomial2DFree);
 
     newPoly->type = type;
@@ -1505,5 +1505,5 @@
 
     newPoly = (psDPolynomial3D* ) psAlloc(sizeof(psDPolynomial3D));
-    psMemSetDeallocator(newPoly, (psFreeFcn) dPolynomial3DFree);
+    psMemSetDeallocator(newPoly, (psFreeFunc) dPolynomial3DFree);
 
     newPoly->type = type;
@@ -1553,5 +1553,5 @@
 
     newPoly = (psDPolynomial4D* ) psAlloc(sizeof(psDPolynomial4D));
-    psMemSetDeallocator(newPoly, (psFreeFcn) dPolynomial4DFree);
+    psMemSetDeallocator(newPoly, (psFreeFunc) dPolynomial4DFree);
 
     newPoly->type = type;
@@ -1858,5 +1858,5 @@
     tmp->knots->data.F32[numSplines] = max;
 
-    psMemSetDeallocator(tmp,(psFreeFcn)spline1DFree);
+    psMemSetDeallocator(tmp,(psFreeFunc)spline1DFree);
     return(tmp);
 }
@@ -1901,5 +1901,5 @@
     }
 
-    psMemSetDeallocator(tmp,(psFreeFcn)spline1DFree);
+    psMemSetDeallocator(tmp,(psFreeFunc)spline1DFree);
     return(tmp);
 }
Index: /trunk/psLib/src/math/psStats.c
===================================================================
--- /trunk/psLib/src/math/psStats.c	(revision 4391)
+++ /trunk/psLib/src/math/psStats.c	(revision 4392)
@@ -14,6 +14,6 @@
  *      stats->binsize
  *
- *  @version $Revision: 1.134 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-06-18 02:30:49 $
+ *  @version $Revision: 1.135 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-06-25 02:02:05 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -1810,5 +1810,5 @@
     // bins, then there are N+1 bounds to those bins.
     newHist = (psHistogram* ) psAlloc(sizeof(psHistogram));
-    psMemSetDeallocator(newHist, (psFreeFcn) histogramFree);
+    psMemSetDeallocator(newHist, (psFreeFunc) histogramFree);
     newHist->bounds = psVectorAlloc(n + 1, PS_TYPE_F32);
     newHist->bounds->n = newHist->bounds->nalloc;
@@ -1857,5 +1857,5 @@
     // Allocate memory for the new histogram structure.
     newHist = (psHistogram* ) psAlloc(sizeof(psHistogram));
-    psMemSetDeallocator(newHist, (psFreeFcn) histogramFree);
+    psMemSetDeallocator(newHist, (psFreeFunc) histogramFree);
     newHist->bounds = psVectorAlloc(bounds->n, PS_TYPE_F32);
     newHist->bounds->n = newHist->bounds->nalloc;
Index: /trunk/psLib/src/mathtypes/psImage.c
===================================================================
--- /trunk/psLib/src/mathtypes/psImage.c	(revision 4391)
+++ /trunk/psLib/src/mathtypes/psImage.c	(revision 4392)
@@ -9,6 +9,6 @@
  *  @author Ross Harman, MHPCC
  *
- *  @version $Revision: 1.70 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-06-21 03:01:37 $
+ *  @version $Revision: 1.71 $ $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,5 +67,5 @@
     psImage* image = (psImage* ) psAlloc(sizeof(psImage));
 
-    psMemSetDeallocator(image, (psFreeFcn) imageFree);
+    psMemSetDeallocator(image, (psFreeFunc) imageFree);
 
     image->data.V = psAlloc(sizeof(psPtr ) * numRows);
Index: /trunk/psLib/src/mathtypes/psVector.c
===================================================================
--- /trunk/psLib/src/mathtypes/psVector.c	(revision 4391)
+++ /trunk/psLib/src/mathtypes/psVector.c	(revision 4392)
@@ -9,6 +9,6 @@
 *  @author Robert DeSonia, MHPCC
 *
-*  @version $Revision: 1.43 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2005-06-21 03:01:37 $
+*  @version $Revision: 1.44 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2005-06-25 02:02:05 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -63,5 +63,5 @@
     // Create vector struct
     psVec = (psVector* ) psAlloc(sizeof(psVector));
-    psMemSetDeallocator(psVec, (psFreeFcn) vectorFree);
+    psMemSetDeallocator(psVec, (psFreeFunc) vectorFree);
 
     psVec->type.dimen = PS_DIMEN_VECTOR;
Index: /trunk/psLib/src/sys/psError.c
===================================================================
--- /trunk/psLib/src/sys/psError.c	(revision 4391)
+++ /trunk/psLib/src/sys/psError.c	(revision 4392)
@@ -10,6 +10,6 @@
  *  @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,5 +62,5 @@
     err->code = code;
 
-    psMemSetDeallocator(err,(psFreeFcn)errFree);
+    psMemSetDeallocator(err,(psFreeFunc)errFree);
 
     return err;
Index: /trunk/psLib/src/sys/psErrorCodes.c
===================================================================
--- /trunk/psLib/src/sys/psErrorCodes.c	(revision 4391)
+++ /trunk/psLib/src/sys/psErrorCodes.c	(revision 4392)
@@ -7,6 +7,6 @@
  *  @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,5 +105,5 @@
     }
 
-    psMemSetDeallocator(err,(psFreeFcn)freeErrorDescription);
+    psMemSetDeallocator(err,(psFreeFunc)freeErrorDescription);
     return err;
 }
Index: /trunk/psLib/src/sys/psMemory.c
===================================================================
--- /trunk/psLib/src/sys/psMemory.c	(revision 4391)
+++ /trunk/psLib/src/sys/psMemory.c	(revision 4392)
@@ -8,6 +8,6 @@
 *  @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,5 +640,5 @@
 }
 
-void psMemSetDeallocator(psPtr vptr, psFreeFcn freeFcn)
+void psMemSetDeallocator(psPtr vptr, psFreeFunc freeFcn)
 {
     if (vptr == NULL) {
@@ -655,5 +655,5 @@
 
 }
-psFreeFcn psMemGetDeallocator(psPtr vptr)
+psFreeFunc psMemGetDeallocator(psPtr vptr)
 {
     if (vptr == NULL) {
Index: /trunk/psLib/src/sys/psMemory.h
===================================================================
--- /trunk/psLib/src/sys/psMemory.h	(revision 4391)
+++ /trunk/psLib/src/sys/psMemory.h	(revision 4392)
@@ -12,6 +12,6 @@
  *  @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,5 +55,5 @@
 
 /// typedef for deallocator.
-typedef void (*psFreeFcn) (psPtr ptr);
+typedef void (*psFreeFunc) (psPtr ptr);
 
 /** Book-keeping data for storage allocator.
@@ -67,5 +67,5 @@
     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,5 +152,5 @@
 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,7 +162,7 @@
  *  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
 );
Index: /trunk/psLib/src/sys/psTrace.c
===================================================================
--- /trunk/psLib/src/sys/psTrace.c	(revision 4391)
+++ /trunk/psLib/src/sys/psTrace.c	(revision 4392)
@@ -9,6 +9,6 @@
  *  @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,5 +67,5 @@
 
     p_psMemSetPersistent(comp,true);
-    psMemSetDeallocator(comp, (psFreeFcn) componentFree);
+    psMemSetDeallocator(comp, (psFreeFunc) componentFree);
     comp->name = psStringCopy(name);
     p_psMemSetPersistent((psPtr)comp->name,true);
Index: /trunk/psLib/src/sysUtils/psError.c
===================================================================
--- /trunk/psLib/src/sysUtils/psError.c	(revision 4391)
+++ /trunk/psLib/src/sysUtils/psError.c	(revision 4392)
@@ -10,6 +10,6 @@
  *  @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,5 +62,5 @@
     err->code = code;
 
-    psMemSetDeallocator(err,(psFreeFcn)errFree);
+    psMemSetDeallocator(err,(psFreeFunc)errFree);
 
     return err;
Index: /trunk/psLib/src/sysUtils/psErrorCodes.c
===================================================================
--- /trunk/psLib/src/sysUtils/psErrorCodes.c	(revision 4391)
+++ /trunk/psLib/src/sysUtils/psErrorCodes.c	(revision 4392)
@@ -7,6 +7,6 @@
  *  @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,5 +105,5 @@
     }
 
-    psMemSetDeallocator(err,(psFreeFcn)freeErrorDescription);
+    psMemSetDeallocator(err,(psFreeFunc)freeErrorDescription);
     return err;
 }
Index: /trunk/psLib/src/sysUtils/psMemory.c
===================================================================
--- /trunk/psLib/src/sysUtils/psMemory.c	(revision 4391)
+++ /trunk/psLib/src/sysUtils/psMemory.c	(revision 4392)
@@ -8,6 +8,6 @@
 *  @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,5 +640,5 @@
 }
 
-void psMemSetDeallocator(psPtr vptr, psFreeFcn freeFcn)
+void psMemSetDeallocator(psPtr vptr, psFreeFunc freeFcn)
 {
     if (vptr == NULL) {
@@ -655,5 +655,5 @@
 
 }
-psFreeFcn psMemGetDeallocator(psPtr vptr)
+psFreeFunc psMemGetDeallocator(psPtr vptr)
 {
     if (vptr == NULL) {
Index: /trunk/psLib/src/sysUtils/psMemory.h
===================================================================
--- /trunk/psLib/src/sysUtils/psMemory.h	(revision 4391)
+++ /trunk/psLib/src/sysUtils/psMemory.h	(revision 4392)
@@ -12,6 +12,6 @@
  *  @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,5 +55,5 @@
 
 /// typedef for deallocator.
-typedef void (*psFreeFcn) (psPtr ptr);
+typedef void (*psFreeFunc) (psPtr ptr);
 
 /** Book-keeping data for storage allocator.
@@ -67,5 +67,5 @@
     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,5 +152,5 @@
 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,7 +162,7 @@
  *  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
 );
Index: /trunk/psLib/src/sysUtils/psTrace.c
===================================================================
--- /trunk/psLib/src/sysUtils/psTrace.c	(revision 4391)
+++ /trunk/psLib/src/sysUtils/psTrace.c	(revision 4392)
@@ -9,6 +9,6 @@
  *  @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,5 +67,5 @@
 
     p_psMemSetPersistent(comp,true);
-    psMemSetDeallocator(comp, (psFreeFcn) componentFree);
+    psMemSetDeallocator(comp, (psFreeFunc) componentFree);
     comp->name = psStringCopy(name);
     p_psMemSetPersistent((psPtr)comp->name,true);
Index: /trunk/psLib/src/types/psArray.c
===================================================================
--- /trunk/psLib/src/types/psArray.c	(revision 4391)
+++ /trunk/psLib/src/types/psArray.c	(revision 4392)
@@ -9,6 +9,6 @@
  *  @author Ross Harman, MHPCC
  *
- *  @version $Revision: 1.31 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-06-23 03:50:29 $
+ *  @version $Revision: 1.32 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-06-25 02:02:04 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -55,5 +55,5 @@
     // Create vector struct
     psArr = (psArray* ) psAlloc(sizeof(psArray));
-    psMemSetDeallocator(psArr, (psFreeFcn) arrayFree);
+    psMemSetDeallocator(psArr, (psFreeFunc) arrayFree);
 
     psArr->nalloc = nalloc;
Index: /trunk/psLib/src/types/psBitSet.c
===================================================================
--- /trunk/psLib/src/types/psBitSet.c	(revision 4391)
+++ /trunk/psLib/src/types/psBitSet.c	(revision 4392)
@@ -11,6 +11,6 @@
  *  @author Robert DeSonia, 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
@@ -80,5 +80,5 @@
     numBytes = ceil(nalloc / 8.0);
     newObj = psAlloc(sizeof(psBitSet));
-    psMemSetDeallocator(newObj, (psFreeFcn) bitSetFree);
+    psMemSetDeallocator(newObj, (psFreeFunc) bitSetFree);
     newObj->n = numBytes;
 
Index: /trunk/psLib/src/types/psHash.c
===================================================================
--- /trunk/psLib/src/types/psHash.c	(revision 4391)
+++ /trunk/psLib/src/types/psHash.c	(revision 4392)
@@ -12,6 +12,6 @@
 *  @author GLG, MHPCC
 *
-*  @version $Revision: 1.20 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2005-06-22 23:48:39 $
+*  @version $Revision: 1.21 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2005-06-25 02:02:05 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -91,5 +91,5 @@
     psHashBucket* bucket = psAlloc(sizeof(psHashBucket));
 
-    psMemSetDeallocator(bucket, (psFreeFcn) hashBucketFree);
+    psMemSetDeallocator(bucket, (psFreeFunc) hashBucketFree);
 
     // Initialize the bucket.
@@ -142,5 +142,5 @@
     psHash* table = psAlloc(sizeof(psHash));
 
-    psMemSetDeallocator(table, (psFreeFcn) hashFree);
+    psMemSetDeallocator(table, (psFreeFunc) hashFree);
 
     // Allocate memory for the buckets.
Index: /trunk/psLib/src/types/psList.c
===================================================================
--- /trunk/psLib/src/types/psList.c	(revision 4391)
+++ /trunk/psLib/src/types/psList.c	(revision 4392)
@@ -6,6 +6,6 @@
  *  @author Robert Daniel DeSonia, MHPCC
  *
- *  @version $Revision: 1.38 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-06-23 03:50:29 $
+ *  @version $Revision: 1.39 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-06-25 02:02:05 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -129,5 +129,5 @@
     psList* list = psAlloc(sizeof(psList));
 
-    psMemSetDeallocator(list, (psFreeFcn) listFree);
+    psMemSetDeallocator(list, (psFreeFunc) listFree);
 
     list->size = 0;
@@ -153,5 +153,5 @@
     psListIterator* iter = psAlloc(sizeof(psListIterator));
 
-    psMemSetDeallocator(iter, (psFreeFcn) listIteratorFree);
+    psMemSetDeallocator(iter, (psFreeFunc) listIteratorFree);
 
     // initialize the attributes
Index: /trunk/psLib/src/types/psLookupTable.c
===================================================================
--- /trunk/psLib/src/types/psLookupTable.c	(revision 4391)
+++ /trunk/psLib/src/types/psLookupTable.c	(revision 4392)
@@ -7,6 +7,6 @@
 *  @author Ross Harman, MHPCC
 *
-*  @version $Revision: 1.20 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2005-06-23 03:19:29 $
+*  @version $Revision: 1.21 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2005-06-25 02:02:05 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, Univ. of Hawaii
@@ -268,5 +268,5 @@
 
     // Set deallocator
-    psMemSetDeallocator(outTable, (psFreeFcn)lookupTableFree);
+    psMemSetDeallocator(outTable, (psFreeFunc)lookupTableFree);
 
     // Allocate and set file name and format strings
Index: /trunk/psLib/src/types/psMetadata.c
===================================================================
--- /trunk/psLib/src/types/psMetadata.c	(revision 4391)
+++ /trunk/psLib/src/types/psMetadata.c	(revision 4392)
@@ -12,6 +12,6 @@
 *  @author Ross Harman, MHPCC
 *
-*  @version $Revision: 1.67 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2005-06-24 01:44:18 $
+*  @version $Revision: 1.68 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2005-06-25 02:02:05 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -186,5 +186,5 @@
 
     // Set deallocator
-    psMemSetDeallocator(metadataItem, (psFreeFcn) metadataItemFree);
+    psMemSetDeallocator(metadataItem, (psFreeFunc) metadataItemFree);
 
     // Allocate and set metadata item comment
@@ -256,5 +256,5 @@
     metadata = (psMetadata*) psAlloc(sizeof(psMetadata));
     // Set deallocator
-    psMemSetDeallocator(metadata, (psFreeFcn) metadataFree);
+    psMemSetDeallocator(metadata, (psFreeFunc) metadataFree);
 
     // Allocate metadata's internal containers
@@ -608,5 +608,5 @@
 
     // Set deallocator
-    psMemSetDeallocator(newIter, (psFreeFcn) metadataIteratorFree);
+    psMemSetDeallocator(newIter, (psFreeFunc) metadataIteratorFree);
 
     if (regex == NULL) {
Index: /trunk/psLib/src/types/psMetadataConfig.c
===================================================================
--- /trunk/psLib/src/types/psMetadataConfig.c	(revision 4391)
+++ /trunk/psLib/src/types/psMetadataConfig.c	(revision 4392)
@@ -10,6 +10,6 @@
 *  @author Eric Van Alst, MHPCC
 *
-*  @version $Revision: 1.30 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2005-06-10 18:09:12 $
+*  @version $Revision: 1.31 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2005-06-25 02:02:05 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -358,5 +358,5 @@
 
         // Set memory deallocator
-        psMemSetDeallocator(info,(psFreeFcn)parseLevelInfoFree);
+        psMemSetDeallocator(info,(psFreeFunc)parseLevelInfoFree);
     }
     return info;
Index: /trunk/psLib/src/types/psPixels.c
===================================================================
--- /trunk/psLib/src/types/psPixels.c	(revision 4391)
+++ /trunk/psLib/src/types/psPixels.c	(revision 4392)
@@ -7,6 +7,6 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.10 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-06-20 22:42:29 $
+ *  @version $Revision: 1.11 $ $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,5 +67,5 @@
     out->nalloc = size;
 
-    psMemSetDeallocator(out, (psFreeFcn)pixelsFree);
+    psMemSetDeallocator(out, (psFreeFunc)pixelsFree);
 
     return out;
Index: /trunk/psLib/src/xml/psXML.c
===================================================================
--- /trunk/psLib/src/xml/psXML.c	(revision 4391)
+++ /trunk/psLib/src/xml/psXML.c	(revision 4392)
@@ -10,6 +10,6 @@
 *  @author Eric Van Alst, MHPCC
 *
-*  @version $Revision: 1.30 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2005-06-10 18:09:12 $
+*  @version $Revision: 1.31 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2005-06-25 02:02:05 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -358,5 +358,5 @@
 
         // Set memory deallocator
-        psMemSetDeallocator(info,(psFreeFcn)parseLevelInfoFree);
+        psMemSetDeallocator(info,(psFreeFunc)parseLevelInfoFree);
     }
     return info;
Index: /trunk/psLib/test/astronomy/tst_psAstrometry01.c
===================================================================
--- /trunk/psLib/test/astronomy/tst_psAstrometry01.c	(revision 4391)
+++ /trunk/psLib/test/astronomy/tst_psAstrometry01.c	(revision 4392)
@@ -5,6 +5,6 @@
 *  @author GLG, MHPCC
 *
-*  @version $Revision: 1.31 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2005-06-13 20:34:51 $
+*  @version $Revision: 1.32 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2005-06-25 02:02:05 $
 *
 * XXX: Must test
@@ -112,5 +112,5 @@
 {\
     NAME = (psPlaneTransform *) psAlloc(sizeof(psPlaneTransform)); \
-    psMemSetDeallocator(NAME, (psFreeFcn) psPlaneTransformFree); \
+    psMemSetDeallocator(NAME, (psFreeFunc) psPlaneTransformFree); \
     NAME->x = psDPolynomial2DAlloc(2, 2, PS_POLYNOMIAL_ORD); \
     NAME->y = psDPolynomial2DAlloc(2, 2, PS_POLYNOMIAL_ORD); \
@@ -122,5 +122,5 @@
 {\
     NAME = (psPlaneDistort *) psAlloc(sizeof(psPlaneDistort)); \
-    psMemSetDeallocator(NAME, (psFreeFcn) psPlaneDistortFree); \
+    psMemSetDeallocator(NAME, (psFreeFunc) psPlaneDistortFree); \
     NAME->x = psDPolynomial4DAlloc(2, 2, 2, 2, PS_POLYNOMIAL_ORD); \
     NAME->y = psDPolynomial4DAlloc(2, 2, 2, 2, PS_POLYNOMIAL_ORD); \
Index: /trunk/psLib/test/collections/tst_psHash01.c
===================================================================
--- /trunk/psLib/test/collections/tst_psHash01.c	(revision 4391)
+++ /trunk/psLib/test/collections/tst_psHash01.c	(revision 4392)
@@ -21,5 +21,5 @@
 {
     ID *id = psAlloc(sizeof(ID));
-    psMemSetDeallocator(id,(psFreeFcn)IdFree);
+    psMemSetDeallocator(id,(psFreeFunc)IdFree);
     id->name = psStringCopy(name);
 
Index: /trunk/psLib/test/collections/tst_psHash02.c
===================================================================
--- /trunk/psLib/test/collections/tst_psHash02.c	(revision 4391)
+++ /trunk/psLib/test/collections/tst_psHash02.c	(revision 4392)
@@ -24,5 +24,5 @@
 {
     ID *id = psAlloc(sizeof(ID));
-    psMemSetDeallocator(id,(psFreeFcn)IdFree);
+    psMemSetDeallocator(id,(psFreeFunc)IdFree);
     id->name = psStringCopy(name);
 
Index: /trunk/psLib/test/collections/tst_psHash03.c
===================================================================
--- /trunk/psLib/test/collections/tst_psHash03.c	(revision 4391)
+++ /trunk/psLib/test/collections/tst_psHash03.c	(revision 4392)
@@ -26,5 +26,5 @@
 
     id = psAlloc(sizeof(ID));
-    psMemSetDeallocator(id,(psFreeFcn)IdFree);
+    psMemSetDeallocator(id,(psFreeFunc)IdFree);
 
     id->name = psStringCopy(name);
Index: /trunk/psLib/test/collections/tst_psHash04.c
===================================================================
--- /trunk/psLib/test/collections/tst_psHash04.c	(revision 4391)
+++ /trunk/psLib/test/collections/tst_psHash04.c	(revision 4392)
@@ -19,5 +19,5 @@
 {
     ID *id = psAlloc(sizeof(ID));
-    psMemSetDeallocator(id,(psFreeFcn)IdFree);
+    psMemSetDeallocator(id,(psFreeFunc)IdFree);
 
     id->name = psStringCopy(name);