Changeset 39457 for trunk/Ohana/src/libfits/table/F_uncompress_T.c

Timestamp:

Mar 11, 2016, 10:23:42 PM (10 years ago)

Author:

eugene

Message:

modify to pass with extremely pedantic build; force consistency for signed vs unsigned and int sizes; various relastro updates

Location:

trunk/Ohana

Files:

• . (modified) (1 prop)
• src/libfits/table/F_uncompress_T.c (modified) (20 diffs)

trunk/Ohana/src/libfits/table/F_uncompress_T.c

@@ -13 +13 @@
 int gfits_dump_raw_table (FTable *table, char *message) {
 # if (VERBOSE_DUMP)
-  int i;
   fprintf (stderr, "%s data:\n", message);
-  for (i = 0; i < table->header->Naxis[0]*table->header->Naxis[1]; i++) {
+  for (int i = 0; i < table->header->Naxis[0]*table->header->Naxis[1]; i++) {
     // for (i = 0; i < 16; i++) {
     fprintf (stderr, "%02hhx", table->buffer[i]);
@@ -22 +21 @@
   }
   fprintf (stderr, "\n");
+# else
+  OHANA_UNUSED_PARAM(table);
+  OHANA_UNUSED_PARAM(message);
 # endif
   return TRUE;
@@ -28 +30 @@
 int gfits_dump_cmp_table (FTable *table, char *message) {
 # if (VERBOSE_DUMP)
-  int i;
   fprintf (stderr, "%s pntr:\n", message);
-  for (i = 0; i < table->header->Naxis[0]*table->header->Naxis[1]; i++) {
+  for (int i = 0; i < table->header->Naxis[0]*table->header->Naxis[1]; i++) {
     fprintf (stderr, "%02hhx", table->buffer[i]);
     if (i % 2) fprintf (stderr, " ");
@@ -38 +39 @@
 
   fprintf (stderr, "%s data:\n", message);
-  for (i = 0; i < table->header->pcount; i++) {
+  for (int i = 0; i < table->header->pcount; i++) {
     fprintf (stderr, "%02hhx", table->buffer[table->heap_start + i]);
     if (i % 2) fprintf (stderr, " ");
@@ -44 +45 @@
   }
   fprintf (stderr, "\n");
+# else
+  OHANA_UNUSED_PARAM(table);
+  OHANA_UNUSED_PARAM(message);
 # endif
   return TRUE;
@@ -77 +81 @@
 int gfits_uncompress_table (FTable *srctable, FTable *tgttable) {
 
-  int i;
-
   char keyword[256];
 
@@ -114 +116 @@
 
   ALLOCATE (fields, TableField, Nfields);
-  for (i = 0; i < Nfields; i++) {
+  for (int i = 0; i < Nfields; i++) {
     snprintf (keyword, 80, "TTYPE%d", i+1);
     if (!gfits_scan (srcheader, keyword, "%s", 1, fields[i].ttype)) ESCAPE;
@@ -170 +172 @@
   // calling with an empty data array, data values are not actually copied (this is done
   // below after decompression)
-  for (i = 0; i < Nfields; i++) {
+  for (int i = 0; i < Nfields; i++) {
     if (!gfits_set_bintable_column (tgtheader, tgttable, fields[i].ttype, NULL, Ny)) ESCAPE;
   }
@@ -200 +202 @@
   gettimeofday (&startTimer, (void *) NULL);
 
-  off_t row;
-  for (row = 0; row < srcheader->Naxis[1]; row++) {
-
-    for (i = 0; i < Nfields; i++) {
+  for (off_t row = 0; row < srcheader->Naxis[1]; row++) {
+
+    for (int i = 0; i < Nfields; i++) {
 
       // gfits_uncompress_data can take values specific to the compression mode
@@ -218 +219 @@
     
       if (VERBOSE_DUMP) {
-        int k;
         fprintf (stderr, "u4: ");
-        for (k = 0; k < Nzdata; k++) {
+        for (int k = 0; k < Nzdata; k++) {
           fprintf (stderr, "%02hhx", zdata[k]);
           if (k % 2) fprintf (stderr, " ");
@@ -250 +250 @@
   
       if (VERBOSE_DUMP) {
-        int k;
         fprintf (stderr, "u3: ");
-        for (k = 0; k < Nzdata; k++) {
+        for (int k = 0; k < Nzdata; k++) {
           fprintf (stderr, "%02hhx", zdata[k]);
           if (k % 2) fprintf (stderr, " ");
@@ -266 +265 @@
       gettimeofday (&startTimer, (void *) NULL);
   
-      int Nrows = (row == Ntile - 1) ? ztilelast : ztilelen;
-      int Nraw = Nrows*fields[i].Nvalues*fields[i].pixsize; // expected number of bytes
+      unsigned long int Nrows = (row == Ntile - 1) ? ztilelast : ztilelen;
+      unsigned long int Nraw = Nrows*fields[i].Nvalues*fields[i].pixsize; // expected number of bytes
       if (!gfits_uncompress_data (zdata, Nzdata, fields[i].zctype, NULL, NULL, 0, raw, &Nraw, Nraw_alloc, fields[i].pixsize)) ESCAPE;
 
       if (VERBOSE_DUMP) {
-        int k;
         fprintf (stderr, "u2: ");
-        for (k = 0; k < Nraw*fields[i].pixsize; k++) {
+        for (unsigned long int k = 0; k < Nraw*fields[i].pixsize; k++) {
           fprintf (stderr, "%02hhx", raw[k]);
           if (k % 2) fprintf (stderr, " ");
@@ -299 +297 @@
   
       if (VERBOSE_DUMP) {
-        int k;
         fprintf (stderr, "u1: ");
-        for (k = 0; k < Nraw*fields[i].pixsize; k++) {
+        for (unsigned long int k = 0; k < Nraw*fields[i].pixsize; k++) {
           fprintf (stderr, "%02hhx", raw[k]);
           if (k % 2) fprintf (stderr, " ");
@@ -356 +353 @@
 int gfits_distribute_table_data (FTable *table, TableField *field, char *raw, int row_start, int Nrows) {
 
-  off_t i;
-
   // we are copying NN rows into the column which starts at XX and has MM bytes per row
 
@@ -367 +362 @@
 
   if (VERBOSE) fprintf (stderr, "distribute: ");
-  for (i = 0; i < Nrows; i++, tblbuffer += Nx) {
+  for (off_t i = 0; i < Nrows; i++, tblbuffer += Nx) {
     memcpy (tblbuffer, &raw[i*rowsize], rowsize);
 # if (VERBOSE)
-    int j; for (j = 0; j < field->rowsize; j++) fprintf (stderr, "0x%02hhx ", table->buffer[Nx*row + field->offset + j]);
+    for (int j = 0; j < field->rowsize; j++) fprintf (stderr, "0x%02hhx ", table->buffer[Nx*row + field->offset + j]);
 # endif
   }
@@ -379 +374 @@
 
 int gfits_distribute_table_gzp2 (FTable *table, TableField *field, char *raw, int row_start, int Nrows) {
-
-  off_t i, j, k;
 
   // we are copying NN rows into the column which starts at XX and has MM bytes per row
@@ -391 +384 @@
   char *rawptr = raw;
 
-  for (k = 0; k < field->pixsize; k++) {
+  for (off_t k = 0; k < field->pixsize; k++) {
 # ifdef BYTE_SWAP      
     char *tblptr_start = &table->buffer[Nx*row_start + offset + (pixsize - k - 1)];
@@ -397 +390 @@
     char *tblptr_start = &table->buffer[Nx*row_start + offset + k];
 # endif
-    for (i = 0; i < Nrows; i++, tblptr_start += Nx) {
+    for (off_t i = 0; i < Nrows; i++, tblptr_start += Nx) {
       char *tblptr = tblptr_start;
-      for (j = 0; j < Nvalues; j++, tblptr += pixsize, rawptr++) {
+      for (off_t j = 0; j < Nvalues; j++, tblptr += pixsize, rawptr++) {
         *tblptr = *rawptr;
       }
@@ -409 +402 @@
 int gfits_distribute_table_gzp2_alt (FTable *table, TableField *field, char *raw, int row_start, int Nrows) {
   
-  off_t i, j, k;
-  
   // we are copying NN rows into the column which starts at XX and has MM bytes per row
   
   off_t Nx = table->header->Naxis[0];
   
-  for (k = 0; k < field->pixsize; k++) {
-    for (i = 0; i < Nrows; i++) {
+  for (off_t k = 0; k < field->pixsize; k++) {
+    for (off_t i = 0; i < Nrows; i++) {
       int row = row_start + i;
       char *rawptr = &raw[i*field->Nvalues + k*Nrows*field->Nvalues];
@@ -424 +415 @@
       char *tblptr = &table->buffer[Nx*row + field->offset + k];
 # endif
-      for (j = 0; j < field->Nvalues; j++, tblptr += field->pixsize, rawptr++) {
+      for (off_t j = 0; j < field->Nvalues; j++, tblptr += field->pixsize, rawptr++) {
         *tblptr = *rawptr;
       }