Index: trunk/psModules/src/astrom/pmAstrometryWCS.c
===================================================================
--- trunk/psModules/src/astrom/pmAstrometryWCS.c	(revision 40532)
+++ trunk/psModules/src/astrom/pmAstrometryWCS.c	(revision 40553)
@@ -218,5 +218,5 @@
     psProjectionType type;
     bool status, pcKeys, cdKeys, isPoly;
-    char name[16]; // used to store FITS keyword below (always < 8, so 16 should be safe!)
+    char name[PS_SMALLWORD]; // used to store FITS keyword below (always < 8, so 16 should be safe!)
 
     // interpret header data, convert to crval(i), etc
@@ -282,6 +282,6 @@
         psVector *maxRadial = psVectorAlloc (21, PS_TYPE_F64);
         for (int i = 0; i <= 20; i++) {
-            char name[64];
-            snprintf (name, 64, "PV2_%d", i);
+            char name[PS_BIGWORD];
+            ps_snprintf_nowarn (name, PS_BIGWORD, "PV2_%d", i);
 
             maxRadial->data.F64[i] = 0.0;
@@ -348,7 +348,7 @@
                         continue;
                     }
-                    sprintf (name, "PCA1X%1dY%1d", i, j);
+                    ps_snprintf_nowarn (name, PS_SMALLWORD, "PCA1X%1dY%1d", i, j);
                     wcs->trans->x->coeff[i][j] = pow(wcs->cdelt1, i) * pow(wcs->cdelt2, j) * psMetadataLookupF64 (&status, header, name);
-                    sprintf (name, "PCA2X%1dY%1d", i, j);
+                    ps_snprintf_nowarn (name, PS_SMALLWORD, "PCA2X%1dY%1d", i, j);
                     wcs->trans->y->coeff[i][j] = pow(wcs->cdelt1, i) * pow(wcs->cdelt2, j) * psMetadataLookupF64 (&status, header, name);
                 }
@@ -382,5 +382,5 @@
 bool pmAstromWCStoHeader (psMetadata *header, const pmAstromWCS *wcs)
 {
-    char name[16]; // used to store FITS keyword below (always < 8, so 16 should be safe!)
+    char name[PS_SMALLWORD]; // used to store FITS keyword below (always < 8, so PS_SMALLWORD should be safe!)
     char *type;
 
@@ -405,5 +405,5 @@
         for (int i = 0; i < wcs->toSky->radial->n; i++) {
             if (wcs->toSky->radial->data.F64[i] == 0.0) continue;
-            snprintf (name, 16, "PV2_%d", i);
+            ps_snprintf_nowarn (name, PS_SMALLWORD, "PV2_%d", i);
             psMetadataAddF64 (header, PS_LIST_TAIL, name, PS_META_REPLACE, "", wcs->toSky->radial->data.F64[i]);
         }
@@ -437,7 +437,7 @@
                     if (i + j > fitOrder)
                         continue;
-                    sprintf (name, "PCA1X%1dY%1d", i, j);
+                    ps_snprintf_nowarn (name, PS_SMALLWORD, "PCA1X%1dY%1d", i, j);
                     psMetadataAddF64 (header, PS_LIST_TAIL, name, PS_META_REPLACE, "", wcs->trans->x->coeff[i][j] / pow(cdelt1, i) / pow(cdelt2, j));
-                    sprintf (name, "PCA2X%1dY%1d", i, j);
+                    ps_snprintf_nowarn (name, PS_SMALLWORD, "PCA2X%1dY%1d", i, j);
                     psMetadataAddF64 (header, PS_LIST_TAIL, name, PS_META_REPLACE, "", wcs->trans->y->coeff[i][j] / pow(cdelt1, i) / pow(cdelt2, j));
                 }