Changeset 13834

Timestamp:

02/21/08 15:59:54 (4 months ago)

Author:

warmerdam

Message:

lots of cleanup - warning clean with -Wall and gcc now

Files:

• spike/grib/degrib18/degrib/clock.c (modified) (2 diffs)
• spike/grib/degrib18/degrib/datasource.h (modified) (1 diff)
• spike/grib/degrib18/degrib/degrib1.cpp (modified) (8 diffs)
• spike/grib/degrib18/degrib/degrib2.cpp (modified) (3 diffs)
• spike/grib/degrib18/degrib/grib2api.c (modified) (16 diffs)
• spike/grib/degrib18/degrib/inventory.cpp (modified) (8 diffs)
• spike/grib/degrib18/degrib/memorydatasource.cpp (modified) (2 diffs)
• spike/grib/degrib18/degrib/metaparse.cpp (modified) (4 diffs)
• spike/grib/degrib18/degrib/metaprint.cpp (modified) (10 diffs)
• spike/grib/degrib18/degrib/myutil.c (modified) (2 diffs)
• spike/grib/degrib18/degrib/tdlpack.cpp (modified) (6 diffs)
• spike/grib/degrib18/g2clib-1.0.4/g2_addfield.c (modified) (2 diffs)
• spike/grib/degrib18/g2clib-1.0.4/g2_addgrid.c (modified) (1 diff)
• spike/grib/degrib18/g2clib-1.0.4/g2_addlocal.c (modified) (2 diffs)
• spike/grib/degrib18/g2clib-1.0.4/g2_getfld.c (modified) (2 diffs)
• spike/grib/degrib18/g2clib-1.0.4/g2_gribend.c (modified) (1 diff)
• spike/grib/degrib18/g2clib-1.0.4/g2_info.c (modified) (1 diff)
• spike/grib/degrib18/g2clib-1.0.4/jpcunpack.c (modified) (1 diff)
• spike/grib/gribdataset.cpp (modified) (2 diffs)

spike/grib/degrib18/degrib/clock.c

@@ -518 +518 @@
-         return;
-      case 'Y':
-l
+
-         return;
-      case 'H':
@@ -1861 +1861 @@
-   Clock_PrintDate (clock, &year, &month, &day, &hour, &min, &d_sec);
-   sec = (int) d_sec;
-l
+
-            sec);
-}

spike/grib/degrib18/degrib/datasource.h

@@ -7 +7 @@
-{
-public:
+        virtual ~DataSource() {}
-        virtual size_t DataSourceFread(void* lpBuf, size_t size, size_t count) = 0;
-        virtual int DataSourceFgetc() = 0;

spike/grib/degrib18/degrib/degrib1.cpp

@@ -588 +588 @@
-         if ((sectLen < 100) && (sectLen != 86)) {
-            printf ("Warning! Problems with Ensemble Clustering section\n");
-l
+
-            return 0;
-         }
@@ -625 +625 @@
-      pds += 12;
-      i_temp = GRIB_SIGN_INT2 (pds[3], pds[4]);
-l
+
-              i_temp);
-      pds += 5;
-      printf (" Ver %c%c%c%c, ", pds[0], pds[1], pds[2], pds[3]);
-      pds += 4;
-l
+
-              sectLen);
-   } else {
@@ -1288 +1288 @@
-      for (i = 0; i < P2; i++) {
-         memBitRead (&uli_temp, sizeof (sInt4), bds, 1, &bufLoc, &numUsed);
-l
+
-         if (numUsed != 0) {
-            printf ("\n");
@@ -1299 +1299 @@
-         secLen++;
-      }
-l
+
-   } else {
-      /* Jump over widths and secondary bitmap */
@@ -1309 +1309 @@
-   for (i = 0; i < P1; i++) {
-      memBitRead (&uli_temp, sizeof (sInt4), bds, numBits, &bufLoc, &numUsed);
-ld) (numUsed %d numBits %d)", i, uli_temp, numUsed,
-
+d) (numUsed %ld numBits %d)", i, uli_temp, 
+(long) numUsed, 
-      if (numUsed != 0) {
-         printf ("\n");
@@ -1322 +1322 @@
-   }
-
-l
+
-   printf ("N2 = %d\n", N2);
-
@@ -1478 +1478 @@
-   if (!f_bms && (meta->gds.numPts * numBits + numUnusedBit) !=
-       (sectLen - 11) * 8) {
-l
-l
+
+
-              (sInt4) (meta->gds.numPts * numBits + numUnusedBit),
-              (sInt4) ((sectLen - 11) * 8));
@@ -1724 +1724 @@
-   /* nd5 needs to be gribLen in (sInt4) units rounded up. */
-#ifdef DEBUG
-l
+
-#endif
-   nd5 = (gribLen + 3) / 4;

spike/grib/degrib18/degrib/degrib2.cpp

@@ -859 +859 @@
-   int version;         /* Which version of GRIB is in this message. */
-   sInt4 cnt;           /* Used to help compact the weather table. */
-   gdsType newGds;      /* The GDS of the subgrid if needed. */
-   int x1, y1;          /* The original grid coordinates of the lower left
-                         * corner of the subgrid. */
@@ -1048 +1047 @@
-            /* Warning. */
-#ifdef DEBUG
-ld %l
+d %
-                    jer[i], jer[ndjer + i]);
-#endif
@@ -1070 +1069 @@
-      if ((fp = fopen ("dump.is0", "wt")) != NULL) {
-         for (i = 0; i < 8; i++) {
-
+(int) 
-            for (j = 1; j <= IS->ns[i]; j++) {
-ld\n", i,
+d\n", (int) i, (int)
-            }
-         }

spike/grib/degrib18/degrib/grib2api.c

@@ -369 +369 @@
-   if (nd2x3 < ngrdpts) {
-#ifdef DEBUG
-ld) is < ngrdpts(%l
+d) is < ngrdpts(%
-#endif
-      return 1;
@@ -392 +392 @@
-      if (nx * ny != ngrdpts) {
-#ifdef DEBUG
-ld) != ngrdpts(%l
+d) != ngrdpts(%
-#endif
-         return 2;
@@ -474 +474 @@
-   if (nd2x3 < ngrdpts) {
-#ifdef DEBUG
-ld) is < ngrdpts(%l
+d) is < ngrdpts(%
-#endif
-      return 1;
@@ -497 +497 @@
-      if (nx * ny != ngrdpts) {
-#ifdef DEBUG
-ld) != ngrdpts(%l
+d) != ngrdpts(%
-#endif
-         return 2;
@@ -1191 +1191 @@
- *****************************************************************************
- */
+#ifdef notdef
-static int validate (char *filename, float * ain, sInt4 * iain,
-                     sInt4 * nd2x3, sInt4 * idat, sInt4 * nidat,
@@ -1211 +1212 @@
-   }
-   for (i = 0; i < *ns0; i++) {
-ld : %l
+d : %
-   }
-   for (i = 0; i < *ns1; i++) {
-ld : %l
+d : %
-   }
-   for (i = 0; i < *ns2; i++) {
-ld : %l
+d : %
-   }
-   for (i = 0; i < idat[0]; i++) {
-ld : %l
+d : %
-   }
-   for (i = 0; i < rdat[0]; i++) {
@@ -1226 +1227 @@
-   }
-   for (i = 0; i < *ns3; i++) {
-ld : %l
+d : %
-   }
-   for (i = 0; i < *ns4; i++) {
-ld : %l
+d : %
-   }
-   for (i = 0; i < *ns5; i++) {
-ld : %l
+d : %
-   }
-   for (i = 0; i < *ns6; i++) {
-ld : %l
+d : %
-   }
-   for (i = 0; i < *ns7; i++) {
-ld : %l
+d : %
-   }
-   fprintf (fp, "Xmissp = %f\n", *xmissp);
@@ -1245 +1246 @@
-      if (is5[20] == 1) {
-         for (i = 0; i < *nd2x3; i++) {
-ld : %l
+d : %
-         }
-      }
-   } else {
-      for (i = 0; i < *nd2x3; i++) {
-l
-
-
-l
+
+
+
+
-   if (*ibitmap) {
-      for (i = 0; i < *nd2x3; i++) {
-ld : %l
+d : %
-      }
-   }
-   for (i = 0; i < *ndjer; i++) {
-ld jer(i,2) %l
-
-l
-l
+d jer(i,2) %
+
+
+
-   fclose (fp);
-   return 0;
-}
+#endif /* def notdef */
-
-/*****************************************************************************
@@ -1314 +1316 @@
- *****************************************************************************
- */
+/*
-static void clear (float * ain, sInt4 * iain, sInt4 * nd2x3, sInt4 * idat,
-                   sInt4 * nidat, float * rdat, sInt4 * nrdat, sInt4 * is0,
@@ -1345 +1348 @@
-   *kjer = 0;
-}
+*/
-
-/*****************************************************************************
@@ -1505 +1509 @@
-         default:
-#ifdef DEBUG
-l
+
-#endif
-            return 2;
@@ -1627 +1631 @@
-   sInt4 drsTmpl;
-   sInt4 numGrps;
-
-
-
-
-
+
-   uChar f_noBitmap;    /* 0 if bitmap, else no bitmap. */
-   sInt4 orderDiff;
-
-#ifdef DEBUG
-   f_useMDL = 0;   /* Experiment with smoke data 12/16/2005 */
-#endif
-
-   if (FindTemplateIDs (ipack, *nd5, 0, &gdsTmpl, &pdsTmpl, &drsTmpl,
@@ -1645 +1641 @@
-      *kjer = 1;
-   }
-#ifdef DEBUG
-   printf ("gdsTemplate number = %ld\n", gdsTmpl);
-   printf ("pdsTemplate number = %ld\n", pdsTmpl);
-   printf ("drsTemplate number = %ld\n", drsTmpl);
-   printf ("f_noBitmap = %d\n", f_noBitmap);
-#endif
-   if ((gdsTmpl != 0) && (gdsTmpl != 10) && (gdsTmpl != 20) &&
-       (gdsTmpl != 30) && (gdsTmpl != 90) && (gdsTmpl != 110) &&
@@ -1661 +1651 @@
-      f_useMDL = 0;
-   }
-#ifdef DEBUG
-   printf ("UseMDL? 1=yes 0=no : ans %d\n", f_useMDL);
-#endif
-   if ((drsTmpl != 0) && (drsTmpl != 2) && (drsTmpl != 3)) {
-      f_useMDL = 0;
-   }
-#ifdef DEBUG
-   printf ("UseMDL? 1=yes 0=no : ans %d\n", f_useMDL);
-#endif
-   /* MDL GRIB2 lib does not support drsTmpl 2 or 3 if there is a bitmap. */
-   if ((!f_noBitmap) && ((drsTmpl == 2) || (drsTmpl == 3))) {
-      f_useMDL = 0;
-   }
-#ifdef DEBUG
-   printf ("UseMDL? 1=yes 0=no : ans %d\n", f_useMDL);
-#endif
-   /* MDL GRIB2 lib does not support anything but second order differencing. */
-   if ((drsTmpl == 3) && (orderDiff != 2) && (orderDiff != 0)) {
-      f_useMDL = 0;
-   }
-#ifdef DEBUG
-   printf ("orderDiff = %d, drsTmpl = %d\n", orderDiff, drsTmpl), 
-   printf ("UseMDL? 1=yes 0=no : ans %d\n", f_useMDL);
-#endif
-
-#ifdef _FORTRAN
@@ -2035 +2012 @@
-   sInt4 *newboxp;
-   sInt4 *ia;
-   unsigned char *c_ipack;
-/*   float *a;*/
-   char f_useMDL = 1;
@@ -2137 +2113 @@
-
-      printf ("Unable to use MDL Pack library?\n");
-ld , pdsTmpl %ld : drsTmpl %l
+d , pdsTmpl %d : drsTmpl %
-              pdsTmpl, drsTmpl);
-      jer[0 + *ndjer] = 31415926;

spike/grib/degrib18/degrib/inventory.cpp

@@ -124 +124 @@
-      delta = myRound (delta, 2);
-      if (Inv[i].comment == NULL) {
-l
+
-                 Inv[i].msgNum, Inv[i].subgNum, Inv[i].start,
-                 Inv[i].GribVersion, Inv[i].element, Inv[i].shortFstLevel,
@@ -130 +130 @@
-         fflush (stdout);
-      } else {
-l
+
-                 Inv[i].msgNum, Inv[i].subgNum, Inv[i].start,
-                 Inv[i].GribVersion, Inv[i].element, Inv[i].comment,
@@ -627 +627 @@
-   /* Try to convert lenTime to hourly. */
-   if (timeRangeUnit == 0) {
-lenTime / 60.
+(sInt4) (lenTime / 60.)
-      timeRangeUnit = 1;
-   } else if (timeRangeUnit == 1) {
@@ -643 +643 @@
-      timeRangeUnit = 1;
-   } else if (timeRangeUnit == 13) {
-lenTime / 3600.
+(sInt4) (lenTime / 3600.)
-      timeRangeUnit = 1;
-   } else {
@@ -895 +895 @@
-            /* Handle case where there are trailing bytes. */
-            msg = errSprintf (NULL);
-l
+
-                    msgNum);
-            printf ("%s", msg);
@@ -903 +903 @@
-            fileLen = fp.DataSourceFtell();
-            /* fseek (fp, 0L, SEEK_SET); */
-l
+
-                    fileLen - offset);
-            free (buffer);
@@ -1128 +1128 @@
-            /* Handle case where there are trailing bytes. */
-            msg = errSprintf (NULL);
-l
+
-            printf ("%s", msg);
-            free (msg);
@@ -1135 +1135 @@
-            fileLen = fp.DataSourceFtell();
-            /* fseek (fp, 0L, SEEK_SET); */
-l
+
-                    fileLen - offset);
-            free (buffer);

spike/grib/degrib18/degrib/memorydatasource.cpp

@@ -4 +4 @@
-MemoryDataSource::MemoryDataSource(unsigned char * block, long length)
-: seekPos(0)
-, memoryBlock(block)
-, blockLength(length)
-, eof(false)
+, memoryBlock(block)
-{
-}
@@ -16 +16 @@
-size_t MemoryDataSource::DataSourceFread(void* lpBuf, size_t size, size_t count)
-{
-       if (seekPos + size * count >
+        if (seekPos + size * count > (size_t)
-        {
-                count = (blockLength - seekPos) / size;

spike/grib/degrib18/degrib/metaparse.cpp

@@ -1150 +1150 @@
-   if (is4[4] != 4) {
-#ifdef DEBUG
-l
+
-#endif
-l
+
-      return -2;
-   }
@@ -1170 +1170 @@
-       (is4[7] != GS4_SATELLITE) && (is4[7] != GS4_DERIVED_INTERVAL)) {
-#ifdef DEBUG
-l
+
-#endif
-l
+
-      return -4;
-   }
@@ -1790 +1790 @@
-                             meta->pds2.refTime) / 3600);
-      } else if (meta->pds2.sect4.Interval[0].timeRangeUnit == 0) {
-lenTime = meta->pds2.sect4.Interval[0].lenTime / 60.
+ lenTime = (sInt4) (meta->pds2.sect4.Interval[0].lenTime / 60.)
-      } else if (meta->pds2.sect4.Interval[0].timeRangeUnit == 1) {
-         lenTime = meta->pds2.sect4.Interval[0].lenTime;
@@ -1802 +1802 @@
-         lenTime = meta->pds2.sect4.Interval[0].lenTime * 12;
-      } else if (meta->pds2.sect4.Interval[0].timeRangeUnit == 13) {
-meta->pds2.sect4.Interval[0].lenTime / 3600.
+(sInt4) (meta->pds2.sect4.Interval[0].lenTime / 3600.)
-      } else {
-         lenTime = 0;

spike/grib/degrib18/degrib/metaprint.cpp

@@ -306 +306 @@
-         for (i = 0; i < sect2->wx.dataLen; i++) {
-            if (sect2->wx.ugly[i].validIndex != -1) {
-sprintf (buffer, "Elem %3d  Is Used",
+ sprintf (buffer, "Elem %3d  Is Used", (int)
-            } else {
-sprintf (buffer, "Elem %3d NOT Used",
+ sprintf (buffer, "Elem %3d NOT Used", (int)
-            }
-            Print ("PDS-S2", buffer, Prt_S, sect2->wx.data[i]);
@@ -317 +317 @@
-                sect2->unknown.dataLen);
-         for (i = 0; i < sect2->unknown.dataLen; i++) {
-sprintf (buffer, "Element %d",
+ sprintf (buffer, "Element %d", (int)
-            Print ("PDS-S2", buffer, Prt_F, sect2->unknown.data[i]);
-         }
@@ -701 +701 @@
-                           sect4->Interval[i].incrType));
-            /* Following is so we get "# str" not "# (str)" */
-l
+
-                     Lookup (tbl44, sizeof (tbl44),
-                             sect4->Interval[i].timeRangeUnit));
-            Print ("PDS-S4", "Time range for processing", Prt_S, buffer);
-            /* Following is so we get "# str" not "# (str)" */
-l
+
-                     Lookup (tbl44, sizeof (tbl44),
-                             sect4->Interval[i].incrUnit));
@@ -742 +742 @@
-                           sect4->Interval[i].incrType));
-            /* Following is so we get "# str" not "# (str)" */
-l
+
-                     Lookup (tbl44, sizeof (tbl44),
-                             sect4->Interval[i].timeRangeUnit));
-            Print ("PDS-S4", "Time range for processing", Prt_S, buffer);
-            /* Following is so we get "# str" not "# (str)" */
-l
+
-                     Lookup (tbl44, sizeof (tbl44),
-                             sect4->Interval[i].incrUnit));
@@ -760 +760 @@
-         Print ("PDS-S4", "Probability type", Prt_DS, sect4->probType,
-                Lookup (tbl49, sizeof (tbl49), sect4->probType));
-l
+
-                  sect4->lowerLimit.factor);
-         Print ("PDS-S4", "Lower limit (scale value, scale factor)", Prt_GS,
-                sect4->lowerLimit.value *
-                pow (10, -1 * sect4->lowerLimit.factor), buffer);
-l
+
-                  sect4->upperLimit.factor);
-         Print ("PDS-S4", "Upper limit (scale value, scale factor)", Prt_GS,
@@ -795 +795 @@
-                           sect4->Interval[i].incrType));
-            /* Following is so we get "# str" not "# (str)" */
-l
+
-                     Lookup (tbl44, sizeof (tbl44),
-                             sect4->Interval[i].timeRangeUnit));
-            Print ("PDS-S4", "Time range for processing", Prt_S, buffer);
-            /* Following is so we get "# str" not "# (str)" */
-l
+
-                     Lookup (tbl44, sizeof (tbl44),
-                             sect4->Interval[i].incrUnit));
@@ -813 +813 @@
-         Print ("PDS-S4", "Probability type", Prt_DS, sect4->probType,
-                Lookup (tbl49, sizeof (tbl49), sect4->probType));
-l
+
-                  sect4->lowerLimit.factor);
-         Print ("PDS-S4", "Lower limit (scale value, scale factor)", Prt_GS,
-                sect4->lowerLimit.value *
-                pow (10, -1 * sect4->lowerLimit.factor), buffer);
-l
+
-                  sect4->upperLimit.factor);
-         Print ("PDS-S4", "Upper limit (scale value, scale factor)", Prt_GS,
@@ -846 +846 @@
-                           sect4->Interval[i].incrType));
-            /* Following is so we get "# str" not "# (str)" */
-l
+
-                     Lookup (tbl44, sizeof (tbl44),
-                             sect4->Interval[i].timeRangeUnit));
-            Print ("PDS-S4", "Time range for processing", Prt_S, buffer);
-            /* Following is so we get "# str" not "# (str)" */
-l
+
-                     Lookup (tbl44, sizeof (tbl44),
-                             sect4->Interval[i].incrUnit));
@@ -860 +860 @@
-         /* This case should have been handled in first switch statement of
-          * this procedure, but just in case... */
-l
+
-         return -2;
-   }
@@ -1151 +1151 @@
-      default:
-         Print ("GDS", "Projection Type", Prt_D, gds->projType);
-l
+
-         return -1;
-   }

spike/grib/degrib18/degrib/myutil.c

@@ -407 +407 @@
-}
-
+/** 
-static int FileMatch (const char *filename, const char *filter)
-{
@@ -437 +438 @@
-   return (*ptr2 == '\0');
-}
+**/
-
-int myGlob (const char *dirName, const char *filter, size_t *Argc,

spike/grib/degrib18/degrib/tdlpack.cpp

@@ -236 +236 @@
-   if (tau != project_hr) {
-      printf ("Warning: Inconsistant Projections in hours in "
-l
+
-/*
-      errSprintf ("Warning: Inconsistant Projections in hours in "
@@ -339 +339 @@
-   Print ("PDS-TDLP", "Reference Time", Prt_S, buffer);
-   Print ("PDS-TDLP", "Plain Language", Prt_S, pds->Descriptor);
-l
+
-   Print ("PDS-TDLP", "ID 1", Prt_S, buffer);
-l
+
-   Print ("PDS-TDLP", "ID 2", Prt_S, buffer);
-l
+
-   Print ("PDS-TDLP", "ID 3", Prt_S, buffer);
-   Print ("PDS-TDLP", "ID 4", Prt_D, pds->ID4);
@@ -1066 +1066 @@
-   printf ("nbit %d, ibit %d, jbit %d, kbit %d\n", nbit, ibit, jbit, kbit);
-   if ((t_numBytes + ceil (t_numBits / 8.)) != sectLen) {
-ld (%ld + %l
-l
+d (%d + %
+
-              t_numBytes, t_numBits, sectLen);
-   }
@@ -1175 +1175 @@
-#ifdef DEBUG
-                     printf ("This doesn't happen often.\n");
-ld\n",
+d\n", (int)
-#endif
-                     myAssert (1 == 2);
@@ -1374 +1374 @@
-#ifdef DEBUG
-                     printf ("This doesn't happen often.\n");
-ld\n",
+d\n", (int)
-                     myAssert (1 == 2);
-#endif
@@ -4382 +4382 @@
-   /* Sanity check ! */
-   if (li_temp != DataLen) {
-ld != DataLen %l
+d != DataLen %
-              DataLen);
-   }

spike/grib/degrib18/g2clib-1.0.4/g2_addfield.c

@@ -190 +190 @@
-        if ( len > lencurr ) {
-          printf("g2_addfield: Section byte counts don''t add to total.\n");
-l
-l
+
+
-          ierr=-3;
-          return(ierr);
@@ -392 +392 @@
-#endif  /* USE_PNG */
-      else {
-l
+
-        ierr=-7;
-        return(ierr);

spike/grib/degrib18/g2clib-1.0.4/g2_addgrid.c

@@ -125 +125 @@
-        if ( len > lencurr ) {
-          printf("g2_addgrid: Section byte counts don''t add to total.\n");
-l
-l
+
+
-          ierr=-3;
-          return(ierr);

spike/grib/degrib18/g2clib-1.0.4/g2_addlocal.c

@@ -103 +103 @@
-        if ( len > lencurr ) {
-          printf("g2_addlocal: Section byte counts don't add to total.\n");
-l
-l
+
+
-          ierr=-3;
-          return(ierr);
@@ -114 +114 @@
-      if ( (isecnum!=1) && (isecnum!=7) ) {
-        printf("g2_addlocal: Section 2 can only be added after Section 1 or Section 7.\n");
-l
+
-        ierr=-4;
-        return(ierr);

spike/grib/degrib18/g2clib-1.0.4/g2_getfld.c

@@ -350 +350 @@
-        //
-        if ( isecnum<1 || isecnum>7 ) {
-l
+
-          ierr=8;
-          return(ierr);
@@ -542 +542 @@
-//  before the requested field was found.
-//
-l
-l
+
+
-      ierr=6;
-

spike/grib/degrib18/g2clib-1.0.4/g2_gribend.c

@@ -98 +98 @@
-      if ( isecnum != 7 ) {
-        printf("g2_gribend: Section 8 can only be added after Section 7.\n");
-l
+
-        ierr=-4;
-        return (ierr);

spike/grib/degrib18/g2clib-1.0.4/g2_info.c

@@ -179 +179 @@
-        }
-        else {
-l
+
-           ierr=6;
-           return(ierr);

spike/grib/degrib18/g2clib-1.0.4/jpcunpack.c

@@ -59 +59 @@
-            return(1);
-         }
-
+(char *) 
-         for (j=0;j<ndpts;j++) {
-           fld[j]=(((g2float)ifld[j]*bscale)+ref)*dscale;

spike/grib/gribdataset.cpp

@@ -208 +208 @@
-
-    char * errMsg = errSprintf(NULL); // no intention to show errors, just swallow it and free the memory
-
+
+
-    free(errMsg);
-    IS_Free(&is);
@@ -302 +303 @@
-        free (buff);
-        char * errMsg = errSprintf(NULL);
-
+
+
-        free(errMsg);
-        return NULL;