Index: /trunk/ppTranslate/src/ppMopsWrite.c =================================================================== --- /trunk/ppTranslate/src/ppMopsWrite.c (revision 40552) +++ /trunk/ppTranslate/src/ppMopsWrite.c (revision 40553) @@ -107,6 +107,6 @@ //field in header that tells about the CMF version - char cmfVersion[8]; - sprintf(cmfVersion, PS1_DV_FORMAT, args->version); + char cmfVersion[16]; + ps_snprintf_nowarn(cmfVersion, 16, PS1_DV_FORMAT, args->version); psMetadataAddStr(header, PS_LIST_TAIL, "CMFVERSION", 0, "CMF version", cmfVersion); Index: /trunk/psModules/src/astrom/pmAstrometryWCS.c =================================================================== --- /trunk/psModules/src/astrom/pmAstrometryWCS.c (revision 40552) +++ /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)); } Index: /trunk/psModules/src/imcombine/pmSubtractionVisual.c =================================================================== --- /trunk/psModules/src/imcombine/pmSubtractionVisual.c (revision 40552) +++ /trunk/psModules/src/imcombine/pmSubtractionVisual.c (revision 40553) @@ -574,5 +574,5 @@ Noverlay = 0; - char boxID[10]; + char boxID[PS_SMALLWORD]; for (int i = 0; i < stamps->num; i++) { @@ -594,5 +594,5 @@ overlay[Noverlay].dy = 40.0; overlay[Noverlay].angle = 0.0; - sprintf(boxID, "%d", i); + ps_snprintf_nowarn(boxID, PS_SMALLWORD, "%d", i); overlay[Noverlay].text = boxID; Noverlay ++; Index: /trunk/psModules/src/objects/pmPSF_IO.c =================================================================== --- /trunk/psModules/src/objects/pmPSF_IO.c (revision 40552) +++ /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; Index: /trunk/psastro/src/psastroModelArguments.c =================================================================== --- /trunk/psastro/src/psastroModelArguments.c (revision 40552) +++ /trunk/psastro/src/psastroModelArguments.c (revision 40553) @@ -65,6 +65,6 @@ // each additional word is a file; create names INPUT.%d for them for (int i = 0; i < argc - 1; i++) { - char name[16]; - snprintf (name, 16, "INPUT.%d", i); + char name[PS_SMALLWORD]; + ps_snprintf_nowarn (name, PS_SMALLWORD, "INPUT.%d", i); psArray *array = psArrayAlloc(1); array->data[0] = psStringCopy (argv[i+1]); Index: /trunk/psastro/src/psastroModelParseCamera.c =================================================================== --- /trunk/psastro/src/psastroModelParseCamera.c (revision 40552) +++ /trunk/psastro/src/psastroModelParseCamera.c (revision 40553) @@ -24,6 +24,6 @@ // but does not load the data) for (int i = 0; i < nInput; i++) { - char name[16]; - snprintf (name, 16, "INPUT.%d", i); + char name[PS_SMALLWORD]; + ps_snprintf_nowarn (name, PS_SMALLWORD, "INPUT.%d", i); input = pmFPAfileDefineFromArgs (&status, config, "PSASTRO.WCS", name); }