Changeset 28484 for branches/pap/Ohana/src/libautocode/def/autocode.c

Timestamp:

Jun 24, 2010, 2:59:09 PM (16 years ago)

Author:

Paul Price

Message:

Merging trunk in advance of reintegrating into trunk.

Location:

branches/pap

Files:

• . (modified) (1 prop)
• Ohana (modified) (1 prop)
• Ohana/src/libautocode/def/autocode.c (modified) (8 diffs)

branches/pap/Ohana/src/libautocode/def/autocode.c

@@ -7 +7 @@
 
   if (size != $SIZE) { 
-    fprintf (stderr, "WARNING: mismatch in data types $STRUCT: %lld vs %lld\n", (long long) size, (long long) $SIZE);
+    fprintf (stderr, "WARNING: mismatch in data types $STRUCT: "OFF_T_FMT" vs %d\n",  size,  $SIZE);
     return (FALSE);
   }
@@ -32 +32 @@
 
   if ($SIZE > size) { 
-    fprintf (stderr, "ERROR: uncorrectable mismatch in data types $STRUCT: %lld vs %lld\n", (long long) size, (long long) $SIZE);
+    fprintf (stderr, "ERROR: uncorrectable mismatch in data types $STRUCT: "OFF_T_FMT" vs %d\n",  size,  $SIZE);
     exit (1);
   }
@@ -60 +60 @@
 $STRUCT *gfits_table_get_$STRUCT (FTable *ftable, off_t *Ndata, char *swapped) {
 
+  int Ncols;
   $STRUCT *data, *output;
+
+  Ncols = ftable[0].header[0].Naxis[0];
+  if (Ncols != $SIZE) {
+    fprintf (stderr, "ERROR: mis-match in table size: width is %d but should be %d bytes\n", Ncols, $SIZE);
+    exit (1);
+  }
 
   *Ndata = ftable[0].header[0].Naxis[1];
@@ -84 +91 @@
 
   /* create table header */
-  gfits_create_table_header (header, "$TYPE", "$EXTNAME");
+  if (!gfits_create_table_header (header, "$TYPE", "$EXTNAME")) return (FALSE);
 
   /* define table layout */
@@ -90 +97 @@
 
   /* create table */
-  gfits_create_table (header, ftable);
+  if (!gfits_create_table (header, ftable)) return (FALSE);
 
   /* add data values */
-  gfits_table_scale_data (ftable);
-  gfits_convert_$STRUCT (data, sizeof ($STRUCT), Ndata);
-  gfits_add_rows (ftable, (char *) data, Ndata, sizeof ($STRUCT));
+  if (!gfits_table_scale_data (ftable)) return (FALSE);
+  if (!gfits_convert_$STRUCT (data, sizeof ($STRUCT), Ndata)) return (FALSE);
+  if (!gfits_add_rows (ftable, (char *) data, Ndata, sizeof ($STRUCT))) return (FALSE);
 
   return (TRUE);
@@ -103 +110 @@
 
   /* create table header */
-  gfits_create_table_header (header, "$TYPE", "$EXTNAME");
+  if (!gfits_create_table_header (header, "$TYPE", "$EXTNAME")) return (FALSE);
 
   /* define table layout */
@@ -125 +132 @@
   }
 
-  gfits_convert_$STRUCT (tmpdata, sizeof ($STRUCT), Ndata);
+  if (!gfits_convert_$STRUCT (tmpdata, sizeof ($STRUCT), Ndata)) return (FALSE);
 
   SendCommand (device, 16, "NVALUE: %6d", Ndata);
@@ -153 +160 @@
   
   tmpdata = ($STRUCT *) message.buffer;
-  gfits_convert_$STRUCT (tmpdata, sizeof ($STRUCT), ndata);
+  if (!gfits_convert_$STRUCT (tmpdata, sizeof ($STRUCT), ndata)) return (FALSE);
 
   /* double-check data length? */