Index: /branches/eam_branches/ohana.20160226/src/libfits/table/F_compress_T.c
===================================================================
--- /branches/eam_branches/ohana.20160226/src/libfits/table/F_compress_T.c	(revision 39427)
+++ /branches/eam_branches/ohana.20160226/src/libfits/table/F_compress_T.c	(revision 39428)
@@ -103,6 +103,5 @@
   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,5 +136,5 @@
   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,5 +162,5 @@
   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,8 +228,7 @@
   // 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,7 +255,6 @@
   
       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,7 +279,6 @@
   
       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,7 +298,6 @@
   
       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,7 +322,6 @@
   
       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,5 +342,5 @@
   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,6 +372,4 @@
 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,8 +381,8 @@
 
   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,6 +394,4 @@
 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,5 +399,5 @@
 
   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,6 +413,4 @@
 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,5 +422,5 @@
   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,8 +428,7 @@
     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,13 +440,10 @@
 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,5 +453,5 @@
       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");
Index: /branches/eam_branches/ohana.20160226/src/libfits/table/F_uncompress_T.c
===================================================================
--- /branches/eam_branches/ohana.20160226/src/libfits/table/F_uncompress_T.c	(revision 39427)
+++ /branches/eam_branches/ohana.20160226/src/libfits/table/F_uncompress_T.c	(revision 39428)
@@ -13,7 +13,6 @@
 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]);
@@ -31,7 +30,6 @@
 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, " ");
@@ -41,5 +39,5 @@
 
   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, " ");
@@ -83,6 +81,4 @@
 int gfits_uncompress_table (FTable *srctable, FTable *tgttable) {
 
-  int i;
-
   char keyword[256];
 
@@ -120,5 +116,5 @@
 
   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;
@@ -176,5 +172,5 @@
   // 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;
   }
@@ -206,8 +202,7 @@
   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
@@ -224,7 +219,6 @@
     
       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, " ");
@@ -256,7 +250,6 @@
   
       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, " ");
@@ -277,7 +270,6 @@
 
       if (VERBOSE_DUMP) {
-	unsigned long 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, " ");
@@ -305,7 +297,6 @@
   
       if (VERBOSE_DUMP) {
-	unsigned long 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, " ");
@@ -362,6 +353,4 @@
 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
 
@@ -373,8 +362,8 @@
 
   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
   }
@@ -385,6 +374,4 @@
 
 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
@@ -397,5 +384,5 @@
   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)];
@@ -403,7 +390,7 @@
     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;
       }
@@ -415,12 +402,10 @@
 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];
@@ -430,5 +415,5 @@
       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;
       }