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

Timestamp:

Jun 25, 2015, 10:41:05 PM (11 years ago)

Author:

eugene

Message:

merge changes from branches/eam_branches/ipp-20150616

File:

• trunk/Ohana/src/libfits/table/F_write_T.c (modified) (2 diffs)

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

@@ -5 +5 @@
 int gfits_write_table (char *filename, FTable *table) {
   
-  FILE *f;
-  int status;
-  
-  status = TRUE;
-  
-  f = fopen (filename, "a+");
+  FILE *f = fopen (filename, "a+");
   if (f == (FILE *) NULL) return (FALSE);
   
-  status = fseeko (f, 0LL, SEEK_END);  /* write table to end of file! */
+  int status = fseeko (f, 0LL, SEEK_END);  /* write table to end of file! */
   if (status) { perror ("fseeko: "); return (FALSE);  }
   status = gfits_fwrite_table (f, table);
@@ -25 +20 @@
   
   off_t Nbytes;
-  
+
+# ifdef OHANA_MEMORY  
+  { // check memory before writing:
+    // memblock of supplied pointer
+    OhanaMemblock *myBlock = (OhanaMemblock *) table[0].buffer - 1;
+    myAssert (myBlock->startblock == OHANA_MEMMAGIC, "bad memory");
+    myAssert (myBlock->endblock == OHANA_MEMMAGIC, "bad memory");
+    myAssert (myBlock->size >= table[0].datasize, "overflow");
+  }
+# endif
+
   Nbytes = fwrite (table[0].buffer, sizeof(char), table[0].datasize, f);
-  if (Nbytes != table[0].datasize) { perror ("fwrite: "); return (FALSE);  }
+  if (Nbytes != table[0].datasize) { 
+    perror ("fwrite: "); 
+    return (FALSE);  
+  }
   return (TRUE);
 }