Changeset 38441 for trunk/Ohana/src/libfits/table/F_write_T.c

Timestamp:

Jun 12, 2015, 6:18:23 PM (11 years ago)

Author:

eugene

Message:

merge changes from EAM dev branch ohana.20150429

Location:

trunk/Ohana

Files:

• . (modified) (1 prop)
• src/libfits/table/F_write_T.c (modified) (9 diffs)

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

@@ -14 +14 @@
   
   status = fseeko (f, 0LL, SEEK_END);  /* write table to end of file! */
+  if (status) { perror ("fseeko: "); return (FALSE);  }
   status = gfits_fwrite_table (f, table);
 
@@ -26 +27 @@
   
   Nbytes = fwrite (table[0].buffer, sizeof(char), table[0].datasize, f);
-  
-  if (Nbytes != table[0].datasize) return (FALSE);
+  if (Nbytes != table[0].datasize) { perror ("fwrite: "); return (FALSE);  }
   return (TRUE);
 }       
@@ -45 +45 @@
   /* file pointer is at beginning of desired table data */
   start = ftello (f);
+  if (start < 0) { perror ("ftello: "); return FALSE; }
   
   for (i = 0; i < Nrow; i++) {
@@ -50 +51 @@
     fseeko (f, offset, SEEK_SET);
     Nbytes = fwrite (table[0].buffer[i], sizeof (char), Nx, f);
-    if (Nbytes != Nx) { return (FALSE); }
+    if (Nbytes != Nx) { perror ("fwrite: "); return (FALSE); }
   }
   
@@ -58 +59 @@
 
   offset = start + Nx*Ny;
-  fseeko (f, offset, SEEK_SET);
+  int status = fseeko (f, offset, SEEK_SET);
+  if (status) { perror ("fseeko: "); return FALSE; }
+
   Nbytes = fwrite (pad, sizeof (char), Npad, f);
-  if (Nbytes != Npad) { return (FALSE); }
+  if (Nbytes != Npad) { perror ("fwrite: "); return (FALSE); }
   free (pad);
 
@@ -84 +87 @@
   Nx = ftable[0].header[0].Naxis[0]; // final output table size on disk 
   ftable[0].datasize = gfits_data_size (ftable[0].header);
+  ftable[0].heap_start = gfits_heap_start (ftable[0].header);
 
   Nskip = start * Nx;
@@ -96 +100 @@
   // cursor must be at start of the table (after table header)
   if (fseeko (f, Nskip, SEEK_CUR)) {
+    perror ("fseeko: ");
     fprintf (stderr, "can't seek table start\n");
     return (FALSE);
@@ -101 +106 @@
 
   Nwrite = fwrite (ftable[0].buffer, sizeof (char), Nbytes, f);
-  if (Nwrite != Nbytes) {
-    return (FALSE);
-  }
+  if (Nwrite != Nbytes) { perror ("fwrite: "); return (FALSE); }
 
   if (Ntotal >= Ndisk) {
@@ -112 +115 @@
     free (pad);
 
-    if (Nbytes != Npad) return (FALSE); 
+    if (Nbytes != Npad) { perror ("fwrite: "); return (FALSE);  }
   }