Changeset 39428 for branches/eam_branches/ohana.20160226/src/libfits/table/F_compress_T.c

Timestamp:

Mar 1, 2016, 12:16:46 PM (10 years ago)

Author:

eugene

Message:

converting some dangerous loop variables to inline

File:

• branches/eam_branches/ohana.20160226/src/libfits/table/F_compress_T.c (modified) (18 diffs)

branches/eam_branches/ohana.20160226/src/libfits/table/F_compress_T.c

@@ -103 +103 @@
   ALLOCATE_ZERO (fields, TableField, Nfields);
 
-  int field;
-  for (field = 0; field < Nfields; field++) {
+  for (int field = 0; field < Nfields; field++) {
     snprintf (keyword, 80, "TTYPE%d", field+1);
     if (!gfits_scan (srcheader, keyword, "%s", 1, fields[field].ttype)) ESCAPE;
@@ -137 +136 @@
   char *tmpbuffer = NULL;
   ALLOCATE_ZERO (tmpbuffer, char, 16*Ntile); // need space for Ntile entries, each of width 16 bytes (2 long)
-  for (field = 0; field < Nfields; field++) {
+  for (int field = 0; field < Nfields; field++) {
     if (!gfits_set_bintable_column (tgtheader, tgttable, fields[field].ttype, tmpbuffer, Ntile)) ESCAPE;
   }
@@ -163 +162 @@
   int offset = 0; // bytes from first column of first field to the current field (accumulate to set)
 
-  for (field = 0; field < Nfields; field++) {
+  for (int field = 0; field < Nfields; field++) {
     snprintf (keyword, 81, "ZFORM%d", field+1);
     if (!gfits_modify (tgtheader, keyword, "%s", 1, fields[field].tformat)) ESCAPE;
@@ -229 +228 @@
   // compress the data : copy into a tile, compress the tile, then add to the output table
   // each tile -> 1 row of the output table
-  unsigned long int tile;
-  for (tile = 0; tile < Ntile; tile++) {
-
-    for (field = 0; field < Nfields; field++) {
+  for (unsigned long int tile = 0; tile < Ntile; tile++) {
+
+    for (int field = 0; field < Nfields; field++) {
 
       gettimeofday (&startTimer, (void *) NULL);
@@ -257 +255 @@
   
       if (VERBOSE_DUMP) {
-        unsigned long int k;
         fprintf (stderr, "c1: ");
-        for (k = 0; k < Nrows*fields[field].Nvalues*fields[field].pixsize; k++) {
+        for (unsigned long int k = 0; k < Nrows*fields[field].Nvalues*fields[field].pixsize; k++) {
           fprintf (stderr, "%02hhx", raw[k]);
           if (k % 2) fprintf (stderr, " ");
@@ -282 +279 @@
   
       if (VERBOSE_DUMP) {
-        unsigned long int k;
         fprintf (stderr, "c2: ");
-        for (k = 0; k < Nrows*fields[field].Nvalues*fields[field].pixsize; k++) {
+        for (unsigned long int k = 0; k < Nrows*fields[field].Nvalues*fields[field].pixsize; k++) {
           fprintf (stderr, "%02hhx", raw[k]);
           if (k % 2) fprintf (stderr, " ");
@@ -302 +298 @@
   
       if (VERBOSE_DUMP) {
-        unsigned long int k;
         fprintf (stderr, "c3: ");
-        for (k = 0; k < Nzdata; k++) {
+        for (unsigned long int k = 0; k < Nzdata; k++) {
           fprintf (stderr, "%02hhx", zdata[k]);
           if (k % 2) fprintf (stderr, " ");
@@ -327 +322 @@
   
       if (VERBOSE_DUMP) {
-        unsigned long int k;
         fprintf (stderr, "c4: ");
-        for (k = 0; k < Nzdata; k++) {
+        for (unsigned long int k = 0; k < Nzdata; k++) {
           fprintf (stderr, "%02hhx", zdata[k]);
           if (k % 2) fprintf (stderr, " ");
@@ -348 +342 @@
   if (OHANA_MEMCHECK) ohana_memcheck (TRUE);
 
-  for (field = 0; field < Nfields; field++) {
+  for (int field = 0; field < Nfields; field++) {
     if (!gfits_varlength_column_finish (tgttable, &fields[field].zdef)) ESCAPE;
   }
@@ -378 +372 @@
 int gfits_collect_table_data (FTable *table, TableField *field, char *raw, unsigned long int row_start, unsigned long int Nrows) {
 
-  unsigned long int i;
-
   // we are copying NN rows into the column which starts at XX and has MM bytes per row
 
@@ -389 +381 @@
 
   if (VERBOSE) fprintf (stderr, "distribute: ");
-  for (i = 0; i < Nrows; i++, tblbuffer += Nx) {
+  for (unsigned long i = 0; i < Nrows; i++, tblbuffer += Nx) {
     memcpy (&raw[i*rowsize], tblbuffer, 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
   }
@@ -402 +394 @@
 int gfits_collect_table_data_alt (FTable *table, TableField *field, char *raw, unsigned long int row_start, unsigned long int Nrows) {
 
-  unsigned long int i;
-
   // we are copying NN rows of the column which starts at XX and has MM bytes per row
 
@@ -409 +399 @@
 
   if (VERBOSE) fprintf (stderr, "collect: ");
-  for (i = 0; i < Nrows; i++) {
+  for (unsigned long i = 0; i < Nrows; i++) {
     int row = row_start + i;
     memcpy (&raw[i*field->rowsize], &table->buffer[Nx*row + field->offset], field->rowsize);
@@ -423 +413 @@
 int gfits_collect_table_gzp2 (FTable *table, TableField *field, char *raw, unsigned long int row_start, unsigned long int Nrows) {
 
-  off_t j, k;
-
   // we are copying NN rows into the column which starts at XX and has MM bytes per row
 
@@ -434 +422 @@
   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)];
@@ -440 +428 @@
     char *tblptr_start = &table->buffer[Nx*row_start + offset + k];
 # endif
-    unsigned long int i;
-    for (i = 0; i < Nrows; i++, tblptr_start += Nx) {
+    for (unsigned long int 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++) {
         *rawptr = *tblptr;
       }
@@ -453 +440 @@
 int gfits_collect_table_gzp2_alt (FTable *table, TableField *field, char *raw, unsigned long int row_start, unsigned long int Nrows) {
 
-  off_t 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++) {
-    unsigned long int i;
-    for (i = 0; i < Nrows; i++) {
+  for (off_t k = 0; k < field->pixsize; k++) {
+    for (unsigned long int i = 0; i < Nrows; i++) {
       unsigned long int row = row_start + i;
       char *rawptr = &raw[i*field->Nvalues + k*Nrows*field->Nvalues];
@@ -469 +453 @@
       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++) {
         *rawptr = *tblptr;
         myAssert (rawptr >= raw, "oops");