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

trunk/Ohana/src/libfits/header/F_write_H.c

@@ -5 +5 @@
 int gfits_write_header (char *filename, Header *header) {
 
-  FILE *f;
-  off_t Nbytes;
-  int status;
-  
-  status = TRUE;
+  FILE *f = fopen (filename, "w");
+  if (!f) return (FALSE);
 
-  f = fopen (filename, "w");
-  if (f == (FILE *) NULL) return (FALSE);
-
-  Nbytes = fwrite (header[0].buffer, sizeof(char), header[0].datasize, f);
-
-  if (Nbytes != header[0].datasize) {
-    status = FALSE;
-  }
-
+  int status = gfits_fwrite_header (f, header);
   fclose (f);
 
@@ -29 +18 @@
 
   off_t Nbytes; 
-  int status;
-  
-  status = TRUE;
+
+# ifdef OHANA_MEMORY  
+  { // check memory before writing:
+    // 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) {
-    status = FALSE;
+  if (Nbytes != header[0].datasize) { 
+    perror ("fwrite: "); 
+    return FALSE; 
   }
-
-  return (status);
+  return TRUE;
 }       
 
 
 int gfits_fwrite_header (FILE *f, Header *header) {
-
-  int status;
-  status = gfits_save_header (f, header);
+  int status = gfits_save_header (f, header);
   return (status);
 }