Index: trunk/psModules/src/objects/pmPSF_IO.c
===================================================================
--- trunk/psModules/src/objects/pmPSF_IO.c	(revision 36892)
+++ trunk/psModules/src/objects/pmPSF_IO.c	(revision 40553)
@@ -456,6 +456,6 @@
             psMetadataAddS32 (header, PS_LIST_TAIL, "PSF_CLN", PS_META_REPLACE, "number of psf clump regions", nRegions);
             for (int i = 0; i < nRegions; i++) {
-                char regionName[64];
-                snprintf (regionName, 64, "PSF.CLUMP.REGION.%03d", i);
+                char regionName[PS_BIGWORD];
+                snprintf (regionName, PS_BIGWORD, "PSF.CLUMP.REGION.%03d", i);
                 psMetadata *regionMD = psMetadataLookupPtr (&status, roAnalysis, regionName);
 
@@ -465,12 +465,12 @@
                 psfClump.dY = psMetadataLookupF32 (&status, regionMD, "PSF.CLUMP.DY");  assert (status);
 
-                char key[16];
-                snprintf (key, 9, "CLX_%03d", i);
+                char key[PS_SMALLWORD];
+                ps_snprintf_nowarn (key, PS_SMALLWORD, "CLX_%03d", i);
                 psMetadataAddF32 (header, PS_LIST_TAIL, key, PS_META_REPLACE, "psf clump center", psfClump.X);
-                snprintf (key, 9, "CLY_%03d", i);
+                ps_snprintf_nowarn (key, PS_SMALLWORD, "CLY_%03d", i);
                 psMetadataAddF32 (header, PS_LIST_TAIL, key, PS_META_REPLACE, "psf clump center", psfClump.Y);
-                snprintf (key, 9, "CLDX_%03d", i);
+                ps_snprintf_nowarn (key, PS_SMALLWORD, "CLDX_%03d", i);
                 psMetadataAddF32 (header, PS_LIST_TAIL, key, PS_META_REPLACE, "psf clump size", psfClump.dX);
-                snprintf (key, 9, "CLDY_%03d", i);
+                ps_snprintf_nowarn (key, PS_SMALLWORD, "CLDY_%03d", i);
                 psMetadataAddF32 (header, PS_LIST_TAIL, key, PS_META_REPLACE, "psf clump size", psfClump.dY);
             }
@@ -479,5 +479,5 @@
         // save the dimensions of each parameter
         for (int i = 0; i < nPar; i++) {
-            char name[9];
+            char name[PS_SMALLWORD];
             int nX, nY;
 
@@ -492,9 +492,9 @@
 		nY = trend->poly->nY;
             }
-            snprintf (name, 9, "PAR%02d_NX", i);
+            ps_snprintf_nowarn (name, PS_SMALLWORD, "PAR%02d_NX", i);
             psMetadataAddS32 (header, PS_LIST_TAIL, name, 0, "", nX);
-            snprintf (name, 9, "PAR%02d_NY", i);
+            ps_snprintf_nowarn (name, PS_SMALLWORD, "PAR%02d_NY", i);
             psMetadataAddS32 (header, PS_LIST_TAIL, name, 0, "", nY);
-            snprintf (name, 9, "PAR%02d_MD", i);
+            ps_snprintf_nowarn (name, PS_SMALLWORD, "PAR%02d_MD", i);
             char *modeName = pmTrend2DModeToString (trend->mode);
             psMetadataAddStr (header, PS_LIST_TAIL, name, 0, "", modeName);
@@ -944,10 +944,10 @@
     // load the trend mode and dimensions of each parameter
     for (int i = 0; i < nPar; i++) {
-        char name[9];
-        snprintf (name, 9, "PAR%02d_NX", i);
+        char name[PS_SMALLWORD];
+        ps_snprintf_nowarn (name, PS_SMALLWORD, "PAR%02d_NX", i);
         binning->nXruff = psMetadataLookupS32 (&status, header, name);
         if (!status) continue;          // not all parameters are defined
 
-        snprintf (name, 9, "PAR%02d_NY", i);
+	ps_snprintf_nowarn (name, PS_SMALLWORD, "PAR%02d_NY", i);
         binning->nYruff = psMetadataLookupS32 (&status, header, name);
         if (!status) {
@@ -956,5 +956,5 @@
         }
 
-        snprintf (name, 9, "PAR%02d_MD", i);
+        ps_snprintf_nowarn (name, PS_SMALLWORD, "PAR%02d_MD", i);
         char *modeName = psMetadataLookupStr (&status, header, name);
         if (!status) {
@@ -1352,6 +1352,6 @@
 	// read old-style psf clump data
 
-	char regionName[64];
-	snprintf (regionName, 64, "PSF.CLUMP.REGION.000");
+	char regionName[PS_BIGWORD];
+	ps_snprintf_nowarn (regionName, PS_BIGWORD, "PSF.CLUMP.REGION.000");
 	psMetadata *regionMD = psMetadataLookupPtr (&status, analysis, regionName);
 
@@ -1376,7 +1376,7 @@
     } else {
 	for (int i = 0; i < nRegions; i++) {
-	    char key[10];
-	    char regionName[64];
-	    snprintf (regionName, 64, "PSF.CLUMP.REGION.%03d", i);
+	    char key[PS_SMALLWORD];
+	    char regionName[PS_BIGWORD];
+	    ps_snprintf_nowarn (regionName, PS_BIGWORD, "PSF.CLUMP.REGION.%03d", i);
 
 	    psMetadata *regionMD = psMetadataLookupPtr (&status, analysis, regionName);
@@ -1390,11 +1390,11 @@
 	    pmPSFClump psfClump;
 
-	    snprintf (key, 9, "CLX_%03d", i);
+	    ps_snprintf_nowarn (key, PS_SMALLWORD, "CLX_%03d", i);
 	    psfClump.X  = psMetadataLookupF32 (&status, header, key);  if (!status) return false;
-	    snprintf (key, 9, "CLY_%03d", i);
+	    ps_snprintf_nowarn (key, PS_SMALLWORD, "CLY_%03d", i);
 	    psfClump.Y  = psMetadataLookupF32 (&status, header, key);  if (!status) return false;
-	    snprintf (key, 9, "CLDX_%03d", i);
+	    ps_snprintf_nowarn (key, PS_SMALLWORD, "CLDX_%03d", i);
 	    psfClump.dX = psMetadataLookupF32 (&status, header, key);  if (!status) return false;
-	    snprintf (key, 9, "CLDY_%03d", i);
+	    ps_snprintf_nowarn (key, PS_SMALLWORD, "CLDY_%03d", i);
 	    psfClump.dY = psMetadataLookupF32 (&status, header, key);  if (!status) return false;