Changeset 38553 for trunk/Ohana/src/libfits/table/F_write_TH.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_TH.c (modified) (2 diffs)

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

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