Changeset 27838 for branches/tap_branches/Ohana/src/libautocode/def/autocode.c

Timestamp:

May 3, 2010, 8:41:49 AM (16 years ago)

Author:

eugene

Message:

updates from trunk

Location:

branches/tap_branches

Files:

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

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

@@ -1 +1 @@
 # include "autocode.h"
 
-int gfits_convert_$STRUCT ($STRUCT *data, int size, int nitems) {
+int gfits_convert_$STRUCT ($STRUCT *data, off_t size, off_t nitems) {
 
-  int i;
+  off_t i;
   unsigned char *byte, tmp;
 
   if (size != $SIZE) { 
-    fprintf (stderr, "WARNING: mismatch in data types $STRUCT: %d vs %d\n", size, $SIZE);
+    fprintf (stderr, "WARNING: mismatch in data types $STRUCT: %lld vs %lld\n", (long long) size, (long long) $SIZE);
     return (FALSE);
   }
@@ -25 +25 @@
 } 
 
-$STRUCT *gfits_downsize_and_convert_$STRUCT ($STRUCT *data, int size, int nitems) {
+$STRUCT *gfits_downsize_and_convert_$STRUCT ($STRUCT *data, off_t size, off_t nitems) {
 
-  int i;
+  off_t i;
   unsigned char *byte, tmp;
   $STRUCT *output;
 
   if ($SIZE > size) { 
-    fprintf (stderr, "ERROR: uncorrectable mismatch in data types $STRUCT: %d vs %d\n", size, $SIZE);
+    fprintf (stderr, "ERROR: uncorrectable mismatch in data types $STRUCT: %lld vs %lld\n", (long long) size, (long long) $SIZE);
     exit (1);
   }
@@ -58 +58 @@
 /*** add test of EXTNAME and header-defined columns? ***/
 /* return internal structure representation */
-$STRUCT *gfits_table_get_$STRUCT (FTable *ftable, int *Ndata, int *swapped) {
+$STRUCT *gfits_table_get_$STRUCT (FTable *ftable, off_t *Ndata, char *swapped) {
 
   $STRUCT *data, *output;
@@ -68 +68 @@
       output = gfits_downsize_and_convert_$STRUCT (data, sizeof ($STRUCT), *Ndata);
       free (ftable[0].buffer);
-      ftable[0].buffer = output;
+      ftable[0].buffer = (char *) output;
       // XXX do I need to change NX?
     }
@@ -77 +77 @@
 }
 
-int gfits_table_set_$STRUCT (FTable *ftable, $STRUCT *data, int Ndata) {
+int gfits_table_set_$STRUCT (FTable *ftable, $STRUCT *data, off_t Ndata) {
 
   Header *header;
@@ -113 +113 @@
 int Send_$STRUCT (int device, $STRUCT *data, int Ndata, int copy) {
 
-  int Nbytes;
+  int Nwrite, Nbytes;
   $STRUCT *tmpdata;
 
@@ -129 +129 @@
   SendCommand (device, 16, "NVALUE: %6d", Ndata);
   SendCommand (device, 16, "NBYTES: %6d", Nbytes);
-  write (device, tmpdata, Nbytes);
+  Nwrite = write (device, tmpdata, Nbytes);
+  if (Nwrite != Nbytes) {
+    return (FALSE);
+  }
   
   /* perform handshaking? */