IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 40553


Ignore:
Timestamp:
Oct 20, 2018, 9:10:43 PM (8 years ago)
Author:
eugene
Message:

use ps_snprintf_nowarn function to avoid compiler optimization warnings triggered by overly-script gcc checking since 8.1

Location:
trunk
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • trunk/ppTranslate/src/ppMopsWrite.c

    r40346 r40553  
    107107
    108108  //field in header that tells about the CMF version
    109   char cmfVersion[8];
    110   sprintf(cmfVersion, PS1_DV_FORMAT, args->version);
     109  char cmfVersion[16];
     110  ps_snprintf_nowarn(cmfVersion, 16, PS1_DV_FORMAT, args->version);
    111111  psMetadataAddStr(header, PS_LIST_TAIL, "CMFVERSION", 0, "CMF version", cmfVersion);
    112112

  • trunk/psModules/src/astrom/pmAstrometryWCS.c

    r40532 r40553  
    218218    psProjectionType type;
    219219    bool status, pcKeys, cdKeys, isPoly;
    220     char name[16]; // used to store FITS keyword below (always < 8, so 16 should be safe!)
     220    char name[PS_SMALLWORD]; // used to store FITS keyword below (always < 8, so 16 should be safe!)
    221221
    222222    // interpret header data, convert to crval(i), etc
    … …  
    282282        psVector *maxRadial = psVectorAlloc (21, PS_TYPE_F64);
    283283        for (int i = 0; i <= 20; i++) {
    284             char name[64];
    285             snprintf (name, 64, "PV2_%d", i);
     284            char name[PS_BIGWORD];
     285            ps_snprintf_nowarn (name, PS_BIGWORD, "PV2_%d", i);
    286286
    287287            maxRadial->data.F64[i] = 0.0;
    … …  
    348348                        continue;
    349349                    }
    350                     sprintf (name, "PCA1X%1dY%1d", i, j);
     350                    ps_snprintf_nowarn (name, PS_SMALLWORD, "PCA1X%1dY%1d", i, j);
    351351                    wcs->trans->x->coeff[i][j] = pow(wcs->cdelt1, i) * pow(wcs->cdelt2, j) * psMetadataLookupF64 (&status, header, name);
    352                     sprintf (name, "PCA2X%1dY%1d", i, j);
     352                    ps_snprintf_nowarn (name, PS_SMALLWORD, "PCA2X%1dY%1d", i, j);
    353353                    wcs->trans->y->coeff[i][j] = pow(wcs->cdelt1, i) * pow(wcs->cdelt2, j) * psMetadataLookupF64 (&status, header, name);
    354354                }
    … …  
    382382bool pmAstromWCStoHeader (psMetadata *header, const pmAstromWCS *wcs)
    383383{
    384     char name[16]; // used to store FITS keyword below (always < 8, so 16 should be safe!)
     384    char name[PS_SMALLWORD]; // used to store FITS keyword below (always < 8, so PS_SMALLWORD should be safe!)
    385385    char *type;
    386386
    … …  
    405405        for (int i = 0; i < wcs->toSky->radial->n; i++) {
    406406            if (wcs->toSky->radial->data.F64[i] == 0.0) continue;
    407             snprintf (name, 16, "PV2_%d", i);
     407            ps_snprintf_nowarn (name, PS_SMALLWORD, "PV2_%d", i);
    408408            psMetadataAddF64 (header, PS_LIST_TAIL, name, PS_META_REPLACE, "", wcs->toSky->radial->data.F64[i]);
    409409        }
    … …  
    437437                    if (i + j > fitOrder)
    438438                        continue;
    439                     sprintf (name, "PCA1X%1dY%1d", i, j);
     439                    ps_snprintf_nowarn (name, PS_SMALLWORD, "PCA1X%1dY%1d", i, j);
    440440                    psMetadataAddF64 (header, PS_LIST_TAIL, name, PS_META_REPLACE, "", wcs->trans->x->coeff[i][j] / pow(cdelt1, i) / pow(cdelt2, j));
    441                     sprintf (name, "PCA2X%1dY%1d", i, j);
     441                    ps_snprintf_nowarn (name, PS_SMALLWORD, "PCA2X%1dY%1d", i, j);
    442442                    psMetadataAddF64 (header, PS_LIST_TAIL, name, PS_META_REPLACE, "", wcs->trans->y->coeff[i][j] / pow(cdelt1, i) / pow(cdelt2, j));
    443443                }

  • trunk/psModules/src/imcombine/pmSubtractionVisual.c

    r40454 r40553  
    574574
    575575    Noverlay = 0;
    576     char boxID[10];
     576    char boxID[PS_SMALLWORD];
    577577    for (int i = 0; i < stamps->num; i++) {
    578578
    … …  
    594594        overlay[Noverlay].dy = 40.0;
    595595        overlay[Noverlay].angle = 0.0;
    596         sprintf(boxID, "%d", i);
     596        ps_snprintf_nowarn(boxID, PS_SMALLWORD, "%d", i);
    597597        overlay[Noverlay].text = boxID;
    598598        Noverlay ++;

  • trunk/psModules/src/objects/pmPSF_IO.c

    r36892 r40553  
    456456            psMetadataAddS32 (header, PS_LIST_TAIL, "PSF_CLN", PS_META_REPLACE, "number of psf clump regions", nRegions);
    457457            for (int i = 0; i < nRegions; i++) {
    458                 char regionName[64];
    459                 snprintf (regionName, 64, "PSF.CLUMP.REGION.%03d", i);
     458                char regionName[PS_BIGWORD];
     459                snprintf (regionName, PS_BIGWORD, "PSF.CLUMP.REGION.%03d", i);
    460460                psMetadata *regionMD = psMetadataLookupPtr (&status, roAnalysis, regionName);
    461461
    … …  
    465465                psfClump.dY = psMetadataLookupF32 (&status, regionMD, "PSF.CLUMP.DY");  assert (status);
    466466
    467                 char key[16];
    468                 snprintf (key, 9, "CLX_%03d", i);
     467                char key[PS_SMALLWORD];
     468                ps_snprintf_nowarn (key, PS_SMALLWORD, "CLX_%03d", i);
    469469                psMetadataAddF32 (header, PS_LIST_TAIL, key, PS_META_REPLACE, "psf clump center", psfClump.X);
    470                 snprintf (key, 9, "CLY_%03d", i);
     470                ps_snprintf_nowarn (key, PS_SMALLWORD, "CLY_%03d", i);
    471471                psMetadataAddF32 (header, PS_LIST_TAIL, key, PS_META_REPLACE, "psf clump center", psfClump.Y);
    472                 snprintf (key, 9, "CLDX_%03d", i);
     472                ps_snprintf_nowarn (key, PS_SMALLWORD, "CLDX_%03d", i);
    473473                psMetadataAddF32 (header, PS_LIST_TAIL, key, PS_META_REPLACE, "psf clump size", psfClump.dX);
    474                 snprintf (key, 9, "CLDY_%03d", i);
     474                ps_snprintf_nowarn (key, PS_SMALLWORD, "CLDY_%03d", i);
    475475                psMetadataAddF32 (header, PS_LIST_TAIL, key, PS_META_REPLACE, "psf clump size", psfClump.dY);
    476476            }
    … …  
    479479        // save the dimensions of each parameter
    480480        for (int i = 0; i < nPar; i++) {
    481             char name[9];
     481            char name[PS_SMALLWORD];
    482482            int nX, nY;
    483483
    … …  
    492492                nY = trend->poly->nY;
    493493            }
    494             snprintf (name, 9, "PAR%02d_NX", i);
     494            ps_snprintf_nowarn (name, PS_SMALLWORD, "PAR%02d_NX", i);
    495495            psMetadataAddS32 (header, PS_LIST_TAIL, name, 0, "", nX);
    496             snprintf (name, 9, "PAR%02d_NY", i);
     496            ps_snprintf_nowarn (name, PS_SMALLWORD, "PAR%02d_NY", i);
    497497            psMetadataAddS32 (header, PS_LIST_TAIL, name, 0, "", nY);
    498             snprintf (name, 9, "PAR%02d_MD", i);
     498            ps_snprintf_nowarn (name, PS_SMALLWORD, "PAR%02d_MD", i);
    499499            char *modeName = pmTrend2DModeToString (trend->mode);
    500500            psMetadataAddStr (header, PS_LIST_TAIL, name, 0, "", modeName);
    … …  
    944944    // load the trend mode and dimensions of each parameter
    945945    for (int i = 0; i < nPar; i++) {
    946         char name[9];
    947         snprintf (name, 9, "PAR%02d_NX", i);
     946        char name[PS_SMALLWORD];
     947        ps_snprintf_nowarn (name, PS_SMALLWORD, "PAR%02d_NX", i);
    948948        binning->nXruff = psMetadataLookupS32 (&status, header, name);
    949949        if (!status) continue;          // not all parameters are defined
    950950
    951         snprintf (name, 9, "PAR%02d_NY", i);
     951        ps_snprintf_nowarn (name, PS_SMALLWORD, "PAR%02d_NY", i);
    952952        binning->nYruff = psMetadataLookupS32 (&status, header, name);
    953953        if (!status) {
    … …  
    956956        }
    957957
    958         snprintf (name, 9, "PAR%02d_MD", i);
     958        ps_snprintf_nowarn (name, PS_SMALLWORD, "PAR%02d_MD", i);
    959959        char *modeName = psMetadataLookupStr (&status, header, name);
    960960        if (!status) {
    … …  
    13521352        // read old-style psf clump data
    13531353
    1354         char regionName[64];
    1355         snprintf (regionName, 64, "PSF.CLUMP.REGION.000");
     1354        char regionName[PS_BIGWORD];
     1355        ps_snprintf_nowarn (regionName, PS_BIGWORD, "PSF.CLUMP.REGION.000");
    13561356        psMetadata *regionMD = psMetadataLookupPtr (&status, analysis, regionName);
    13571357
    … …  
    13761376    } else {
    13771377        for (int i = 0; i < nRegions; i++) {
    1378             char key[10];
    1379             char regionName[64];
    1380             snprintf (regionName, 64, "PSF.CLUMP.REGION.%03d", i);
     1378            char key[PS_SMALLWORD];
     1379            char regionName[PS_BIGWORD];
     1380            ps_snprintf_nowarn (regionName, PS_BIGWORD, "PSF.CLUMP.REGION.%03d", i);
    13811381
    13821382            psMetadata *regionMD = psMetadataLookupPtr (&status, analysis, regionName);
    … …  
    13901390            pmPSFClump psfClump;
    13911391
    1392             snprintf (key, 9, "CLX_%03d", i);
     1392            ps_snprintf_nowarn (key, PS_SMALLWORD, "CLX_%03d", i);
    13931393            psfClump.X  = psMetadataLookupF32 (&status, header, key);  if (!status) return false;
    1394             snprintf (key, 9, "CLY_%03d", i);
     1394            ps_snprintf_nowarn (key, PS_SMALLWORD, "CLY_%03d", i);
    13951395            psfClump.Y  = psMetadataLookupF32 (&status, header, key);  if (!status) return false;
    1396             snprintf (key, 9, "CLDX_%03d", i);
     1396            ps_snprintf_nowarn (key, PS_SMALLWORD, "CLDX_%03d", i);
    13971397            psfClump.dX = psMetadataLookupF32 (&status, header, key);  if (!status) return false;
    1398             snprintf (key, 9, "CLDY_%03d", i);
     1398            ps_snprintf_nowarn (key, PS_SMALLWORD, "CLDY_%03d", i);
    13991399            psfClump.dY = psMetadataLookupF32 (&status, header, key);  if (!status) return false;
    14001400

  • trunk/psastro/src/psastroModelArguments.c

    r21409 r40553  
    6565    // each additional word is a file; create names INPUT.%d for them
    6666    for (int i = 0; i < argc - 1; i++) {
    67         char name[16];
    68         snprintf (name, 16, "INPUT.%d", i);
     67        char name[PS_SMALLWORD];
     68        ps_snprintf_nowarn (name, PS_SMALLWORD, "INPUT.%d", i);
    6969        psArray *array = psArrayAlloc(1);
    7070        array->data[0] = psStringCopy (argv[i+1]);

  • trunk/psastro/src/psastroModelParseCamera.c

    r21409 r40553  
    2424    // but does not load the data)
    2525    for (int i = 0; i < nInput; i++) {
    26         char name[16];
    27         snprintf (name, 16, "INPUT.%d", i);
     26        char name[PS_SMALLWORD];
     27        ps_snprintf_nowarn (name, PS_SMALLWORD, "INPUT.%d", i);
    2828        input = pmFPAfileDefineFromArgs (&status, config, "PSASTRO.WCS", name);
    2929    }
Note: See TracChangeset for help on using the changeset viewer.