Changeset 35695

Timestamp:

Jun 21, 2013, 3:18:41 PM (13 years ago)

Author:

eugene

Message:

use init functions in gfits_init_db instead of assignments

Location:

branches/eam_branches/ipp-20130509/Ohana/src/libdvo/src

Files:

• LoadPhotcodesFITS.c (modified) (1 diff)
• fits_db.c (modified) (8 diffs)

branches/eam_branches/ipp-20130509/Ohana/src/libdvo/src/LoadPhotcodesFITS.c

@@ -15 +15 @@
 
   /* XXX choose more sensible lock timeouts! */
+  db.timeout   = 60.0;
   db.lockstate = LCK_SOFT;
-  db.timeout   = 60.0;
   gfits_db_init (&db);
 

branches/eam_branches/ipp-20130509/Ohana/src/libdvo/src/fits_db.c

@@ -6 +6 @@
   db[0].f             = NULL;
   db[0].filename      = NULL;
+  
+# if (1)
+  gfits_init_header (&db->header);
+  gfits_init_matrix (&db->matrix);
+  gfits_init_header (&db->theader);
+  gfits_init_table (&db->ftable);
+  db->ftable.header = &db->theader;
+  gfits_init_vtable (&db->vtable);
+# else  
   db[0].header.buffer = NULL;
   db[0].matrix.buffer = NULL;
@@ -11 +20 @@
   db[0].ftable.buffer = NULL;
   db[0].ftable.header = &db[0].theader;
-
   db[0].vtable.header = NULL;
   db[0].vtable.buffer = NULL;
   db[0].vtable.row    = NULL;
+# endif
   return (TRUE);
 }
@@ -74 +83 @@
   }
   if (!gfits_fread_matrix (db[0].f, &db[0].matrix, &db[0].header)) {
-    fprintf (stderr, "can't read primary matrix");
+    fprintf (stderr, "can't read primary matrix\n");
     gfits_db_free (db);
     return (FALSE);
   }
   if (!gfits_fread_header (db[0].f, &db[0].theader)) {
-    fprintf (stderr, "can't read table header");
+    fprintf (stderr, "can't read table header\n");
     gfits_db_free (db);
     return (FALSE);
   }
   if (!gfits_fread_ftable_data (db[0].f, &db[0].ftable, FALSE)) {
-    fprintf (stderr, "can't read table data");
+    fprintf (stderr, "can't read table data\n");
     gfits_db_free (db);
     return (FALSE);
@@ -126 +135 @@
   if (db[0].matrix.buffer == NULL) {
     if (!gfits_fread_matrix (db[0].f, &db[0].matrix, &db[0].header)) {
-      fprintf (stderr, "can't read primary matrix");
+      fprintf (stderr, "can't read primary matrix\n");
       return (FALSE);
     }
@@ -137 +146 @@
   if (db[0].theader.buffer == NULL) {
     if (!gfits_fread_header (db[0].f, &db[0].theader)) {
-      fprintf (stderr, "can't read table header");
+      fprintf (stderr, "can't read table header\n");
       return (FALSE);
     }
@@ -147 +156 @@
   /* read table segment into vtable */
   if (!gfits_fread_vtable_range (db[0].f, &db[0].vtable, start, Nrows)) {
-    fprintf (stderr, "can't read table data");
+    fprintf (stderr, "can't read table data\n");
     return (FALSE);
   }
@@ -167 +176 @@
 
   if (!gfits_fwrite_header  (db[0].f, &db[0].header)) {
-    fprintf (stderr, "can't write primary header");
+    fprintf (stderr, "can't write primary header\n");
     return (FALSE);
   }
   if (!gfits_fwrite_matrix  (db[0].f, &db[0].matrix)) {
-    fprintf (stderr, "can't write primary matrix");
+    fprintf (stderr, "can't write primary matrix\n");
     return (FALSE);
   }
   if (!gfits_fwrite_Theader (db[0].f, &db[0].theader)) {
-    fprintf (stderr, "can't write table header");
+    fprintf (stderr, "can't write table header\n");
     return (FALSE);
   }
   if (!gfits_fwrite_table   (db[0].f, &db[0].ftable)) {
-    fprintf (stderr, "can't write table data");
+    fprintf (stderr, "can't write table data\n");
     return (FALSE);
   }
@@ -196 +205 @@
   /* do we revert to the old version if this fails? */
   if (!gfits_fwrite_header   (db[0].f, &db[0].header))  {
-    fprintf (stderr, "can't update primary header");
+    fprintf (stderr, "can't update primary header\n");
     return (FALSE);
   }
   if (!gfits_fwrite_matrix   (db[0].f, &db[0].matrix))  {
-    fprintf (stderr, "can't update primary matrix");
+    fprintf (stderr, "can't update primary matrix\n");
     return (FALSE);
   }
   if (!gfits_fwrite_Theader  (db[0].f, &db[0].theader)) {
-    fprintf (stderr, "can't update table header");
+    fprintf (stderr, "can't update table header\n");
     return (FALSE);
   }
   if (!gfits_fwrite_vtable   (db[0].f, &db[0].vtable))  {
-    fprintf (stderr, "can't update table data");
+    fprintf (stderr, "can't update table data\n");
     return (FALSE);
   }