Changeset 40408 for trunk/Ohana/src/opihi/dvo/region_list.c

Timestamp:

Apr 26, 2018, 12:37:03 PM (8 years ago)

Author:

eugene

Message:

clean up memory leaks for avperiodogram and related; finish avperiodomatch

File:

• trunk/Ohana/src/opihi/dvo/region_list.c (modified) (2 diffs)

trunk/Ohana/src/opihi/dvo/region_list.c

@@ -181 +181 @@
   SkyList *skylist;
 
+  // the list of regions comes directly from a file
+  if (selection->list != NULL) {
+    skylist = SkyListLoadFile (selection->list);
+    return (skylist);
+  }
+
+  // all other options require sky to be set
+  if (!sky) {
+    gprint (GP_ERR, "CATDIR not set\n");
+    return NULL;
+  }
+
   /* determine region-file names */
   if (selection->name != NULL) {
@@ -186 +198 @@
     return (skylist);
   } 
-
-  if (selection->list != NULL) {
-    skylist = SkyListLoadFile (selection->list);
-    return (skylist);
-  }
 
   if (selection->useDisplay) {