Changeset 33360

Timestamp:

Feb 24, 2012, 7:50:04 AM (14 years ago)

Author:

eugene

Message:

add better error checks

File:

• branches/eam_branches/ipp-20111122/Ohana/src/opihi/dvo/mextract.c (modified) (4 diffs)

branches/eam_branches/ipp-20111122/Ohana/src/opihi/dvo/mextract.c

@@ -462 +462 @@
   // load the list of hosts
   SkyTable *sky = GetSkyTable();
-  if (!sky) return FALSE;
+  if (!sky) {
+    gprint (GP_ERR, "failed to load sky table for database\n");
+    return FALSE;
+  }
 
   char *tmppath = GetCATDIR ();
-  if (!tmppath) return FALSE;
+  if (!tmppath) {
+    gprint (GP_ERR, "failed to get CATDIR for database\n");
+    return FALSE;
+  }
 
   char *CATDIR = abspath (tmppath, MAX_PATH_LENGTH);
-  if (!CATDIR) return FALSE;
+  if (!CATDIR) {
+    gprint (GP_ERR, "failed to make an absolute path from %s (too long)\n", tmppath);
+    return FALSE;
+  }
 
   HostTable *table = HostTableLoad (CATDIR, sky->hosts);
   if (!table) {
-    fprintf (stderr, "ERROR: failure reading Host Table %s for database %s\n", sky->hosts, CATDIR);
+    gprint (GP_ERR, "ERROR: failure reading Host Table %s for database %s\n", sky->hosts, CATDIR);
     return FALSE;
   }    
@@ -485 +494 @@
   // determine time reference and format
   char *TimeRef = get_variable ("TIMEREF");
-  if (!TimeRef) return FALSE;
+  if (!TimeRef) {
+    gprint (GP_ERR, "failed to find TIMEREF variable\n");
+    return FALSE;
+  }
 
   char *TimeFormat = get_variable ("TIMEFORMAT");
-  if (!TimeFormat) return FALSE;
+  if (!TimeFormat) {
+    gprint (GP_ERR, "failed to find TIMEFORMAT variable\n");
+    return FALSE;
+  }
 
   char tmp;
@@ -502 +517 @@
 
   if (PARALLEL_MANUAL) {
-    fprintf (stderr, "run the relphot_client commands above.  when these are done, hit return\n");
+    gprint (GP_ERR, "run the relphot_client commands above.  when these are done, hit return\n");
     getchar();
   }
@@ -528 +543 @@
   if (ResultFile) {
     int status = WriteVectorTableFITS (ResultFile, "RESULT", vec, Nvec, FALSE, NULL);
-    if (!status) return FALSE;
+    if (!status) {
+      gprint (GP_ERR, "failed to write result file %s\n", ResultFile);
+      return FALSE;
+    }
   }