Changeset 40553 for trunk/psModules/src/objects/pmPSF_IO.c

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

File:

• trunk/psModules/src/objects/pmPSF_IO.c (modified) (9 diffs)

trunk/psModules/src/objects/pmPSF_IO.c

@@ -456 +456 @@
             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 +465 @@
                 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 +479 @@
         // save the dimensions of each parameter
         for (int i = 0; i < nPar; i++) {
-            char name[9];
+            char name[PS_SMALLWORD];
             int nX, nY;
 
@@ -492 +492 @@
                 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 +944 @@
     // 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 +956 @@
         }
 
-        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 +1352 @@
         // 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 +1376 @@
     } 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 +1390 @@
             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;