Changeset 4392

Timestamp:

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

Author:

drobbin

Message:

changed psFreeFcn to psFreeFunc

Location:

trunk/psLib

Files:

• src/astro/psCoord.c (modified) (6 diffs)
• src/astronomy/psAstrometry.c (modified) (8 diffs)
• src/astronomy/psCoord.c (modified) (6 diffs)
• src/collections/psArray.c (modified) (2 diffs)
• src/collections/psBitSet.c (modified) (2 diffs)
• src/collections/psHash.c (modified) (3 diffs)
• src/collections/psList.c (modified) (3 diffs)
• src/collections/psMetadata.c (modified) (4 diffs)
• src/collections/psMetadataIO.c (modified) (2 diffs)
• src/collections/psPixels.c (modified) (2 diffs)
• src/collections/psVector.c (modified) (2 diffs)
• src/dataIO/psFits.c (modified) (2 diffs)
• src/dataIO/psLookupTable.c (modified) (2 diffs)
• src/dataManip/psFunctions.c (modified) (11 diffs)
• src/dataManip/psStats.c (modified) (3 diffs)
• src/fits/psFits.c (modified) (2 diffs)
• src/image/psImage.c (modified) (2 diffs)
• src/image/psImageConvolve.c (modified) (2 diffs)
• src/imageops/psImageConvolve.c (modified) (2 diffs)
• src/math/psPolynomial.c (modified) (11 diffs)
• src/math/psSpline.c (modified) (11 diffs)
• src/math/psStats.c (modified) (3 diffs)
• src/mathtypes/psImage.c (modified) (2 diffs)
• src/mathtypes/psVector.c (modified) (2 diffs)
• src/sys/psError.c (modified) (2 diffs)
• src/sys/psErrorCodes.c (modified) (2 diffs)
• src/sys/psMemory.c (modified) (3 diffs)
• src/sys/psMemory.h (modified) (5 diffs)
• src/sys/psTrace.c (modified) (2 diffs)
• src/sysUtils/psError.c (modified) (2 diffs)
• src/sysUtils/psErrorCodes.c (modified) (2 diffs)
• src/sysUtils/psMemory.c (modified) (3 diffs)
• src/sysUtils/psMemory.h (modified) (5 diffs)
• src/sysUtils/psTrace.c (modified) (2 diffs)
• src/types/psArray.c (modified) (2 diffs)
• src/types/psBitSet.c (modified) (2 diffs)
• src/types/psHash.c (modified) (3 diffs)
• src/types/psList.c (modified) (3 diffs)
• src/types/psLookupTable.c (modified) (2 diffs)
• src/types/psMetadata.c (modified) (4 diffs)
• src/types/psMetadataConfig.c (modified) (2 diffs)
• src/types/psPixels.c (modified) (2 diffs)
• src/xml/psXML.c (modified) (2 diffs)
• test/astronomy/tst_psAstrometry01.c (modified) (3 diffs)
• test/collections/tst_psHash01.c (modified) (1 diff)
• test/collections/tst_psHash02.c (modified) (1 diff)
• test/collections/tst_psHash03.c (modified) (1 diff)
• test/collections/tst_psHash04.c (modified) (1 diff)

trunk/psLib/src/astro/psCoord.c

@@ -10 +10 @@
 *  @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 +197 @@
     psPlane *p = psAlloc(sizeof(psPlane));
 
-    psMemSetDeallocator(p, (psFreeFcn) planeFree);
+    psMemSetDeallocator(p, (psFreeFunc) planeFree);
     return(p);
 }
@@ -211 +211 @@
     psSphere *s = psAlloc(sizeof(psSphere));
 
-    psMemSetDeallocator(s, (psFreeFcn) sphereFree);
+    psMemSetDeallocator(s, (psFreeFunc) sphereFree);
     return(s);
 }
@@ -230 +230 @@
     pt->y = psDPolynomial2DAlloc(n1, n2, PS_POLYNOMIAL_ORD);
 
-    psMemSetDeallocator(pt, (psFreeFcn) planeTransformFree);
+    psMemSetDeallocator(pt, (psFreeFunc) planeTransformFree);
     return(pt);
 }
@@ -279 +279 @@
     pt->y = psDPolynomial4DAlloc(n1, n2, n3, n4, PS_POLYNOMIAL_ORD);
 
-    psMemSetDeallocator(pt, (psFreeFcn) planeDistortFree);
+    psMemSetDeallocator(pt, (psFreeFunc) planeDistortFree);
     return(pt);
 }
@@ -494 +494 @@
     p->type = type;
 
-    psMemSetDeallocator(p, (psFreeFcn) projectionFree);
+    psMemSetDeallocator(p, (psFreeFunc) projectionFree);
     return(p);
 }

trunk/psLib/src/astronomy/psAstrometry.c

@@ -8 +8 @@
  *  @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 +189 @@
     }
 
-    psMemSetDeallocator(tmp,(psFreeFcn)fixedPatternFree);
+    psMemSetDeallocator(tmp,(psFreeFunc)fixedPatternFree);
 
     return(tmp);
@@ -236 +236 @@
     exp->telescopeName = NULL;
 
-    psMemSetDeallocator(exp,(psFreeFcn)exposureFree);
+    psMemSetDeallocator(exp,(psFreeFunc)exposureFree);
 
     return exp;
@@ -261 +261 @@
     *(double *)&obs->tlr = tlr;
 
-    psMemSetDeallocator(obs,(psFreeFcn)observatoryFree);
+    psMemSetDeallocator(obs,(psFreeFunc)observatoryFree);
 
     return obs;
@@ -302 +302 @@
     newFPA->chi2 = 0.0f;
 
-    psMemSetDeallocator(newFPA,(psFreeFcn)FPAFree);
+    psMemSetDeallocator(newFPA,(psFreeFunc)FPAFree);
 
     return newFPA;
@@ -336 +336 @@
     chip->parent = parentFPA;
 
-    psMemSetDeallocator(chip,(psFreeFcn)chipFree);
+    psMemSetDeallocator(chip,(psFreeFunc)chipFree);
 
     return chip;
@@ -374 +374 @@
     cell->parent = parentChip;
 
-    psMemSetDeallocator(cell,(psFreeFcn)cellFree);
+    psMemSetDeallocator(cell,(psFreeFunc)cellFree);
 
     return cell;
@@ -397 +397 @@
     readout->metadata = NULL;
 
-    psMemSetDeallocator(readout,(psFreeFcn)readoutFree);
+    psMemSetDeallocator(readout,(psFreeFunc)readoutFree);
 
     return readout;

trunk/psLib/src/astronomy/psCoord.c

@@ -10 +10 @@
 *  @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 +197 @@
     psPlane *p = psAlloc(sizeof(psPlane));
 
-    psMemSetDeallocator(p, (psFreeFcn) planeFree);
+    psMemSetDeallocator(p, (psFreeFunc) planeFree);
     return(p);
 }
@@ -211 +211 @@
     psSphere *s = psAlloc(sizeof(psSphere));
 
-    psMemSetDeallocator(s, (psFreeFcn) sphereFree);
+    psMemSetDeallocator(s, (psFreeFunc) sphereFree);
     return(s);
 }
@@ -230 +230 @@
     pt->y = psDPolynomial2DAlloc(n1, n2, PS_POLYNOMIAL_ORD);
 
-    psMemSetDeallocator(pt, (psFreeFcn) planeTransformFree);
+    psMemSetDeallocator(pt, (psFreeFunc) planeTransformFree);
     return(pt);
 }
@@ -279 +279 @@
     pt->y = psDPolynomial4DAlloc(n1, n2, n3, n4, PS_POLYNOMIAL_ORD);
 
-    psMemSetDeallocator(pt, (psFreeFcn) planeDistortFree);
+    psMemSetDeallocator(pt, (psFreeFunc) planeDistortFree);
     return(pt);
 }
@@ -494 +494 @@
     p->type = type;
 
-    psMemSetDeallocator(p, (psFreeFcn) projectionFree);
+    psMemSetDeallocator(p, (psFreeFunc) projectionFree);
     return(p);
 }

trunk/psLib/src/collections/psArray.c

@@ -9 +9 @@
  *  @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 +55 @@
     // Create vector struct
     psArr = (psArray* ) psAlloc(sizeof(psArray));
-    psMemSetDeallocator(psArr, (psFreeFcn) arrayFree);
+    psMemSetDeallocator(psArr, (psFreeFunc) arrayFree);
 
     psArr->nalloc = nalloc;

trunk/psLib/src/collections/psBitSet.c

@@ -11 +11 @@
  *  @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 +80 @@
     numBytes = ceil(nalloc / 8.0);
     newObj = psAlloc(sizeof(psBitSet));
-    psMemSetDeallocator(newObj, (psFreeFcn) bitSetFree);
+    psMemSetDeallocator(newObj, (psFreeFunc) bitSetFree);
     newObj->n = numBytes;
 

trunk/psLib/src/collections/psHash.c

@@ -12 +12 @@
 *  @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 +91 @@
     psHashBucket* bucket = psAlloc(sizeof(psHashBucket));
 
-    psMemSetDeallocator(bucket, (psFreeFcn) hashBucketFree);
+    psMemSetDeallocator(bucket, (psFreeFunc) hashBucketFree);
 
     // Initialize the bucket.
@@ -142 +142 @@
     psHash* table = psAlloc(sizeof(psHash));
 
-    psMemSetDeallocator(table, (psFreeFcn) hashFree);
+    psMemSetDeallocator(table, (psFreeFunc) hashFree);
 
     // Allocate memory for the buckets.

trunk/psLib/src/collections/psList.c

@@ -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 +129 @@
     psList* list = psAlloc(sizeof(psList));
 
-    psMemSetDeallocator(list, (psFreeFcn) listFree);
+    psMemSetDeallocator(list, (psFreeFunc) listFree);
 
     list->size = 0;
@@ -153 +153 @@
     psListIterator* iter = psAlloc(sizeof(psListIterator));
 
-    psMemSetDeallocator(iter, (psFreeFcn) listIteratorFree);
+    psMemSetDeallocator(iter, (psFreeFunc) listIteratorFree);
 
     // initialize the attributes

trunk/psLib/src/collections/psMetadata.c

@@ -12 +12 @@
 *  @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 +186 @@
 
     // Set deallocator
-    psMemSetDeallocator(metadataItem, (psFreeFcn) metadataItemFree);
+    psMemSetDeallocator(metadataItem, (psFreeFunc) metadataItemFree);
 
     // Allocate and set metadata item comment
@@ -256 +256 @@
     metadata = (psMetadata*) psAlloc(sizeof(psMetadata));
     // Set deallocator
-    psMemSetDeallocator(metadata, (psFreeFcn) metadataFree);
+    psMemSetDeallocator(metadata, (psFreeFunc) metadataFree);
 
     // Allocate metadata's internal containers
@@ -608 +608 @@
 
     // Set deallocator
-    psMemSetDeallocator(newIter, (psFreeFcn) metadataIteratorFree);
+    psMemSetDeallocator(newIter, (psFreeFunc) metadataIteratorFree);
 
     if (regex == NULL) {

trunk/psLib/src/collections/psMetadataIO.c

@@ -10 +10 @@
 *  @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 +358 @@
 
         // Set memory deallocator
-        psMemSetDeallocator(info,(psFreeFcn)parseLevelInfoFree);
+        psMemSetDeallocator(info,(psFreeFunc)parseLevelInfoFree);
     }
     return info;

trunk/psLib/src/collections/psPixels.c

@@ -7 +7 @@
  *  @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 +67 @@
     out->nalloc = size;
 
-    psMemSetDeallocator(out, (psFreeFcn)pixelsFree);
+    psMemSetDeallocator(out, (psFreeFunc)pixelsFree);
 
     return out;

trunk/psLib/src/collections/psVector.c

@@ -9 +9 @@
 *  @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 +63 @@
     // Create vector struct
     psVec = (psVector* ) psAlloc(sizeof(psVector));
-    psMemSetDeallocator(psVec, (psFreeFcn) vectorFree);
+    psMemSetDeallocator(psVec, (psFreeFunc) vectorFree);
 
     psVec->type.dimen = PS_DIMEN_VECTOR;

trunk/psLib/src/dataIO/psFits.c

@@ -7 +7 @@
  *  @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 +249 @@
     fits->p_fd = fptr;
     strcpy((char*)fits->filename,name);
-    psMemSetDeallocator(fits,(psFreeFcn)fitsFree);
+    psMemSetDeallocator(fits,(psFreeFunc)fitsFree);
 
     return fits;

trunk/psLib/src/dataIO/psLookupTable.c

@@ -7 +7 @@
 *  @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 +268 @@
 
     // Set deallocator
-    psMemSetDeallocator(outTable, (psFreeFcn)lookupTableFree);
+    psMemSetDeallocator(outTable, (psFreeFunc)lookupTableFree);
 
     // Allocate and set file name and format strings

trunk/psLib/src/dataManip/psFunctions.c

@@ -7 +7 @@
  *  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 +1078 @@
 
     newPoly = (psPolynomial1D* ) psAlloc(sizeof(psPolynomial1D));
-    psMemSetDeallocator(newPoly, (psFreeFcn) polynomial1DFree);
+    psMemSetDeallocator(newPoly, (psFreeFunc) polynomial1DFree);
 
     newPoly->type = type;
@@ -1105 +1105 @@
 
     newPoly = (psPolynomial2D* ) psAlloc(sizeof(psPolynomial2D));
-    psMemSetDeallocator(newPoly, (psFreeFcn) polynomial2DFree);
+    psMemSetDeallocator(newPoly, (psFreeFunc) polynomial2DFree);
 
     newPoly->type = type;
@@ -1143 +1143 @@
 
     newPoly = (psPolynomial3D* ) psAlloc(sizeof(psPolynomial3D));
-    psMemSetDeallocator(newPoly, (psFreeFcn) polynomial3DFree);
+    psMemSetDeallocator(newPoly, (psFreeFunc) polynomial3DFree);
 
     newPoly->type = type;
@@ -1191 +1191 @@
 
     newPoly = (psPolynomial4D* ) psAlloc(sizeof(psPolynomial4D));
-    psMemSetDeallocator(newPoly, (psFreeFcn) polynomial4DFree);
+    psMemSetDeallocator(newPoly, (psFreeFunc) polynomial4DFree);
 
     newPoly->type = type;
@@ -1440 +1440 @@
 
     newPoly = (psDPolynomial1D* ) psAlloc(sizeof(psDPolynomial1D));
-    psMemSetDeallocator(newPoly, (psFreeFcn) dPolynomial1DFree);
+    psMemSetDeallocator(newPoly, (psFreeFunc) dPolynomial1DFree);
 
     newPoly->type = type;
@@ -1467 +1467 @@
 
     newPoly = (psDPolynomial2D* ) psAlloc(sizeof(psDPolynomial2D));
-    psMemSetDeallocator(newPoly, (psFreeFcn) dPolynomial2DFree);
+    psMemSetDeallocator(newPoly, (psFreeFunc) dPolynomial2DFree);
 
     newPoly->type = type;
@@ -1505 +1505 @@
 
     newPoly = (psDPolynomial3D* ) psAlloc(sizeof(psDPolynomial3D));
-    psMemSetDeallocator(newPoly, (psFreeFcn) dPolynomial3DFree);
+    psMemSetDeallocator(newPoly, (psFreeFunc) dPolynomial3DFree);
 
     newPoly->type = type;
@@ -1553 +1553 @@
 
     newPoly = (psDPolynomial4D* ) psAlloc(sizeof(psDPolynomial4D));
-    psMemSetDeallocator(newPoly, (psFreeFcn) dPolynomial4DFree);
+    psMemSetDeallocator(newPoly, (psFreeFunc) dPolynomial4DFree);
 
     newPoly->type = type;
@@ -1858 +1858 @@
     tmp->knots->data.F32[numSplines] = max;
 
-    psMemSetDeallocator(tmp,(psFreeFcn)spline1DFree);
+    psMemSetDeallocator(tmp,(psFreeFunc)spline1DFree);
     return(tmp);
 }
@@ -1901 +1901 @@
     }
 
-    psMemSetDeallocator(tmp,(psFreeFcn)spline1DFree);
+    psMemSetDeallocator(tmp,(psFreeFunc)spline1DFree);
     return(tmp);
 }

trunk/psLib/src/dataManip/psStats.c

@@ -14 +14 @@
  *      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 +1810 @@
     // 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 +1857 @@
     // 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;

trunk/psLib/src/fits/psFits.c

@@ -7 +7 @@
  *  @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 +249 @@
     fits->p_fd = fptr;
     strcpy((char*)fits->filename,name);
-    psMemSetDeallocator(fits,(psFreeFcn)fitsFree);
+    psMemSetDeallocator(fits,(psFreeFunc)fitsFree);
 
     return fits;

trunk/psLib/src/image/psImage.c

@@ -9 +9 @@
  *  @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 +67 @@
     psImage* image = (psImage* ) psAlloc(sizeof(psImage));
 
-    psMemSetDeallocator(image, (psFreeFcn) imageFree);
+    psMemSetDeallocator(image, (psFreeFunc) imageFree);
 
     image->data.V = psAlloc(sizeof(psPtr ) * numRows);

trunk/psLib/src/image/psImageConvolve.c

@@ -5 +5 @@
  *  @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 +74 @@
     result->kernel = kernelRows - yMin;
 
-    psMemSetDeallocator(result,(psFreeFcn)freeKernel);
+    psMemSetDeallocator(result,(psFreeFunc)freeKernel);
 
     return result;

trunk/psLib/src/imageops/psImageConvolve.c

@@ -5 +5 @@
  *  @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 +74 @@
     result->kernel = kernelRows - yMin;
 
-    psMemSetDeallocator(result,(psFreeFcn)freeKernel);
+    psMemSetDeallocator(result,(psFreeFunc)freeKernel);
 
     return result;

trunk/psLib/src/math/psPolynomial.c

@@ -7 +7 @@
  *  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 +1078 @@
 
     newPoly = (psPolynomial1D* ) psAlloc(sizeof(psPolynomial1D));
-    psMemSetDeallocator(newPoly, (psFreeFcn) polynomial1DFree);
+    psMemSetDeallocator(newPoly, (psFreeFunc) polynomial1DFree);
 
     newPoly->type = type;
@@ -1105 +1105 @@
 
     newPoly = (psPolynomial2D* ) psAlloc(sizeof(psPolynomial2D));
-    psMemSetDeallocator(newPoly, (psFreeFcn) polynomial2DFree);
+    psMemSetDeallocator(newPoly, (psFreeFunc) polynomial2DFree);
 
     newPoly->type = type;
@@ -1143 +1143 @@
 
     newPoly = (psPolynomial3D* ) psAlloc(sizeof(psPolynomial3D));
-    psMemSetDeallocator(newPoly, (psFreeFcn) polynomial3DFree);
+    psMemSetDeallocator(newPoly, (psFreeFunc) polynomial3DFree);
 
     newPoly->type = type;
@@ -1191 +1191 @@
 
     newPoly = (psPolynomial4D* ) psAlloc(sizeof(psPolynomial4D));
-    psMemSetDeallocator(newPoly, (psFreeFcn) polynomial4DFree);
+    psMemSetDeallocator(newPoly, (psFreeFunc) polynomial4DFree);
 
     newPoly->type = type;
@@ -1440 +1440 @@
 
     newPoly = (psDPolynomial1D* ) psAlloc(sizeof(psDPolynomial1D));
-    psMemSetDeallocator(newPoly, (psFreeFcn) dPolynomial1DFree);
+    psMemSetDeallocator(newPoly, (psFreeFunc) dPolynomial1DFree);
 
     newPoly->type = type;
@@ -1467 +1467 @@
 
     newPoly = (psDPolynomial2D* ) psAlloc(sizeof(psDPolynomial2D));
-    psMemSetDeallocator(newPoly, (psFreeFcn) dPolynomial2DFree);
+    psMemSetDeallocator(newPoly, (psFreeFunc) dPolynomial2DFree);
 
     newPoly->type = type;
@@ -1505 +1505 @@
 
     newPoly = (psDPolynomial3D* ) psAlloc(sizeof(psDPolynomial3D));
-    psMemSetDeallocator(newPoly, (psFreeFcn) dPolynomial3DFree);
+    psMemSetDeallocator(newPoly, (psFreeFunc) dPolynomial3DFree);
 
     newPoly->type = type;
@@ -1553 +1553 @@
 
     newPoly = (psDPolynomial4D* ) psAlloc(sizeof(psDPolynomial4D));
-    psMemSetDeallocator(newPoly, (psFreeFcn) dPolynomial4DFree);
+    psMemSetDeallocator(newPoly, (psFreeFunc) dPolynomial4DFree);
 
     newPoly->type = type;
@@ -1858 +1858 @@
     tmp->knots->data.F32[numSplines] = max;
 
-    psMemSetDeallocator(tmp,(psFreeFcn)spline1DFree);
+    psMemSetDeallocator(tmp,(psFreeFunc)spline1DFree);
     return(tmp);
 }
@@ -1901 +1901 @@
     }
 
-    psMemSetDeallocator(tmp,(psFreeFcn)spline1DFree);
+    psMemSetDeallocator(tmp,(psFreeFunc)spline1DFree);
     return(tmp);
 }

trunk/psLib/src/math/psSpline.c

@@ -7 +7 @@
  *  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 +1078 @@
 
     newPoly = (psPolynomial1D* ) psAlloc(sizeof(psPolynomial1D));
-    psMemSetDeallocator(newPoly, (psFreeFcn) polynomial1DFree);
+    psMemSetDeallocator(newPoly, (psFreeFunc) polynomial1DFree);
 
     newPoly->type = type;
@@ -1105 +1105 @@
 
     newPoly = (psPolynomial2D* ) psAlloc(sizeof(psPolynomial2D));
-    psMemSetDeallocator(newPoly, (psFreeFcn) polynomial2DFree);
+    psMemSetDeallocator(newPoly, (psFreeFunc) polynomial2DFree);
 
     newPoly->type = type;
@@ -1143 +1143 @@
 
     newPoly = (psPolynomial3D* ) psAlloc(sizeof(psPolynomial3D));
-    psMemSetDeallocator(newPoly, (psFreeFcn) polynomial3DFree);
+    psMemSetDeallocator(newPoly, (psFreeFunc) polynomial3DFree);
 
     newPoly->type = type;
@@ -1191 +1191 @@
 
     newPoly = (psPolynomial4D* ) psAlloc(sizeof(psPolynomial4D));
-    psMemSetDeallocator(newPoly, (psFreeFcn) polynomial4DFree);
+    psMemSetDeallocator(newPoly, (psFreeFunc) polynomial4DFree);
 
     newPoly->type = type;
@@ -1440 +1440 @@
 
     newPoly = (psDPolynomial1D* ) psAlloc(sizeof(psDPolynomial1D));
-    psMemSetDeallocator(newPoly, (psFreeFcn) dPolynomial1DFree);
+    psMemSetDeallocator(newPoly, (psFreeFunc) dPolynomial1DFree);
 
     newPoly->type = type;
@@ -1467 +1467 @@
 
     newPoly = (psDPolynomial2D* ) psAlloc(sizeof(psDPolynomial2D));
-    psMemSetDeallocator(newPoly, (psFreeFcn) dPolynomial2DFree);
+    psMemSetDeallocator(newPoly, (psFreeFunc) dPolynomial2DFree);
 
     newPoly->type = type;
@@ -1505 +1505 @@
 
     newPoly = (psDPolynomial3D* ) psAlloc(sizeof(psDPolynomial3D));
-    psMemSetDeallocator(newPoly, (psFreeFcn) dPolynomial3DFree);
+    psMemSetDeallocator(newPoly, (psFreeFunc) dPolynomial3DFree);
 
     newPoly->type = type;
@@ -1553 +1553 @@
 
     newPoly = (psDPolynomial4D* ) psAlloc(sizeof(psDPolynomial4D));
-    psMemSetDeallocator(newPoly, (psFreeFcn) dPolynomial4DFree);
+    psMemSetDeallocator(newPoly, (psFreeFunc) dPolynomial4DFree);
 
     newPoly->type = type;
@@ -1858 +1858 @@
     tmp->knots->data.F32[numSplines] = max;
 
-    psMemSetDeallocator(tmp,(psFreeFcn)spline1DFree);
+    psMemSetDeallocator(tmp,(psFreeFunc)spline1DFree);
     return(tmp);
 }
@@ -1901 +1901 @@
     }
 
-    psMemSetDeallocator(tmp,(psFreeFcn)spline1DFree);
+    psMemSetDeallocator(tmp,(psFreeFunc)spline1DFree);
     return(tmp);
 }

trunk/psLib/src/math/psStats.c

@@ -14 +14 @@
  *      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 +1810 @@
     // 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 +1857 @@
     // 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;

trunk/psLib/src/mathtypes/psImage.c

@@ -9 +9 @@
  *  @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 +67 @@
     psImage* image = (psImage* ) psAlloc(sizeof(psImage));
 
-    psMemSetDeallocator(image, (psFreeFcn) imageFree);
+    psMemSetDeallocator(image, (psFreeFunc) imageFree);
 
     image->data.V = psAlloc(sizeof(psPtr ) * numRows);

trunk/psLib/src/mathtypes/psVector.c

@@ -9 +9 @@
 *  @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 +63 @@
     // Create vector struct
     psVec = (psVector* ) psAlloc(sizeof(psVector));
-    psMemSetDeallocator(psVec, (psFreeFcn) vectorFree);
+    psMemSetDeallocator(psVec, (psFreeFunc) vectorFree);
 
     psVec->type.dimen = PS_DIMEN_VECTOR;

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);

trunk/psLib/src/sysUtils/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/sysUtils/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/sysUtils/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/sysUtils/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/sysUtils/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);

trunk/psLib/src/types/psArray.c

@@ -9 +9 @@
  *  @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 +55 @@
     // Create vector struct
     psArr = (psArray* ) psAlloc(sizeof(psArray));
-    psMemSetDeallocator(psArr, (psFreeFcn) arrayFree);
+    psMemSetDeallocator(psArr, (psFreeFunc) arrayFree);
 
     psArr->nalloc = nalloc;

trunk/psLib/src/types/psBitSet.c

@@ -11 +11 @@
  *  @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 +80 @@
     numBytes = ceil(nalloc / 8.0);
     newObj = psAlloc(sizeof(psBitSet));
-    psMemSetDeallocator(newObj, (psFreeFcn) bitSetFree);
+    psMemSetDeallocator(newObj, (psFreeFunc) bitSetFree);
     newObj->n = numBytes;
 

trunk/psLib/src/types/psHash.c

@@ -12 +12 @@
 *  @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 +91 @@
     psHashBucket* bucket = psAlloc(sizeof(psHashBucket));
 
-    psMemSetDeallocator(bucket, (psFreeFcn) hashBucketFree);
+    psMemSetDeallocator(bucket, (psFreeFunc) hashBucketFree);
 
     // Initialize the bucket.
@@ -142 +142 @@
     psHash* table = psAlloc(sizeof(psHash));
 
-    psMemSetDeallocator(table, (psFreeFcn) hashFree);
+    psMemSetDeallocator(table, (psFreeFunc) hashFree);
 
     // Allocate memory for the buckets.

trunk/psLib/src/types/psList.c

@@ -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 +129 @@
     psList* list = psAlloc(sizeof(psList));
 
-    psMemSetDeallocator(list, (psFreeFcn) listFree);
+    psMemSetDeallocator(list, (psFreeFunc) listFree);
 
     list->size = 0;
@@ -153 +153 @@
     psListIterator* iter = psAlloc(sizeof(psListIterator));
 
-    psMemSetDeallocator(iter, (psFreeFcn) listIteratorFree);
+    psMemSetDeallocator(iter, (psFreeFunc) listIteratorFree);
 
     // initialize the attributes

trunk/psLib/src/types/psLookupTable.c

@@ -7 +7 @@
 *  @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 +268 @@
 
     // Set deallocator
-    psMemSetDeallocator(outTable, (psFreeFcn)lookupTableFree);
+    psMemSetDeallocator(outTable, (psFreeFunc)lookupTableFree);
 
     // Allocate and set file name and format strings

trunk/psLib/src/types/psMetadata.c

@@ -12 +12 @@
 *  @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 +186 @@
 
     // Set deallocator
-    psMemSetDeallocator(metadataItem, (psFreeFcn) metadataItemFree);
+    psMemSetDeallocator(metadataItem, (psFreeFunc) metadataItemFree);
 
     // Allocate and set metadata item comment
@@ -256 +256 @@
     metadata = (psMetadata*) psAlloc(sizeof(psMetadata));
     // Set deallocator
-    psMemSetDeallocator(metadata, (psFreeFcn) metadataFree);
+    psMemSetDeallocator(metadata, (psFreeFunc) metadataFree);
 
     // Allocate metadata's internal containers
@@ -608 +608 @@
 
     // Set deallocator
-    psMemSetDeallocator(newIter, (psFreeFcn) metadataIteratorFree);
+    psMemSetDeallocator(newIter, (psFreeFunc) metadataIteratorFree);
 
     if (regex == NULL) {

trunk/psLib/src/types/psMetadataConfig.c

@@ -10 +10 @@
 *  @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 +358 @@
 
         // Set memory deallocator
-        psMemSetDeallocator(info,(psFreeFcn)parseLevelInfoFree);
+        psMemSetDeallocator(info,(psFreeFunc)parseLevelInfoFree);
     }
     return info;

trunk/psLib/src/types/psPixels.c

@@ -7 +7 @@
  *  @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 +67 @@
     out->nalloc = size;
 
-    psMemSetDeallocator(out, (psFreeFcn)pixelsFree);
+    psMemSetDeallocator(out, (psFreeFunc)pixelsFree);
 
     return out;

trunk/psLib/src/xml/psXML.c

@@ -10 +10 @@
 *  @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 +358 @@
 
         // Set memory deallocator
-        psMemSetDeallocator(info,(psFreeFcn)parseLevelInfoFree);
+        psMemSetDeallocator(info,(psFreeFunc)parseLevelInfoFree);
     }
     return info;

trunk/psLib/test/astronomy/tst_psAstrometry01.c

@@ -5 +5 @@
 *  @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 +112 @@
 {\
     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 +122 @@
 {\
     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); \

trunk/psLib/test/collections/tst_psHash01.c

@@ -21 +21 @@
 {
     ID *id = psAlloc(sizeof(ID));
-    psMemSetDeallocator(id,(psFreeFcn)IdFree);
+    psMemSetDeallocator(id,(psFreeFunc)IdFree);
     id->name = psStringCopy(name);
 

trunk/psLib/test/collections/tst_psHash02.c

@@ -24 +24 @@
 {
     ID *id = psAlloc(sizeof(ID));
-    psMemSetDeallocator(id,(psFreeFcn)IdFree);
+    psMemSetDeallocator(id,(psFreeFunc)IdFree);
     id->name = psStringCopy(name);
 

trunk/psLib/test/collections/tst_psHash03.c

@@ -26 +26 @@
 
     id = psAlloc(sizeof(ID));
-    psMemSetDeallocator(id,(psFreeFcn)IdFree);
+    psMemSetDeallocator(id,(psFreeFunc)IdFree);
 
     id->name = psStringCopy(name);

trunk/psLib/test/collections/tst_psHash04.c

@@ -19 +19 @@
 {
     ID *id = psAlloc(sizeof(ID));
-    psMemSetDeallocator(id,(psFreeFcn)IdFree);
+    psMemSetDeallocator(id,(psFreeFunc)IdFree);
 
     id->name = psStringCopy(name);