Changeset 13039 for trunk/Ohana/src/libfits/header/F_read_XH.c

Timestamp:

Apr 25, 2007, 4:18:23 PM (19 years ago)

Author:

eugene

Message:

convert gfits_read_segment to gfits_read_matrix_segment; add gfits_fread_matrix_segment

File:

• trunk/Ohana/src/libfits/header/F_read_XH.c (modified) (3 diffs)

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

@@ -4 +4 @@
 /*********************** fits read header ***********************************/
 int gfits_read_Xheader (char *filename, Header *header, int N) {
+
+  int status;
+  FILE *f;
+
+  f = fopen (filename, "r");
+  if (f == NULL) {
+    header[0].buffer = NULL;
+    fclose (f);
+    return (FALSE);
+  }
+
+  status = gfits_fread_Xheader (f, header, N);
+  if (!status) {
+    header[0].buffer = NULL;
+    fclose (f);
+    return (FALSE);
+  }
+
+  fclose (f);
+  return (TRUE);
+
+}
+
+/*********************** fits read header ***********************************/
+int gfits_fread_Xheader (FILE *f, Header *header, int N) {
   
   /* read header for extension number N */
 
-  FILE *f;
   int j, Nmatrix, Nskip;
   Header theader;
   
-  f = fopen (filename, "r");
-  if (f == NULL) {
-    header[0].buffer = NULL;
-    return (FALSE);
-  }
+  /* set f to beginning of file */
+  fseek (f, 0, SEEK_SET);
 
   Nskip = 0;
@@ -21 +42 @@
     /* load data for this header */
     if (!gfits_load_header (f, &theader)) {
-      fclose (f);
       return (FALSE);
     }
@@ -34 +54 @@
   
   if (!gfits_load_header (f, header)) {
-    fclose (f);
     return (FALSE);
   }
-  fclose (f);
   Nskip += header[0].size;
   return (Nskip);