Changeset 20873 for branches/eam_branch_20081124/Ohana/src/opihi/dvo/mextract.c

Timestamp:

Dec 2, 2008, 6:24:28 PM (18 years ago)

Author:

eugene

Message:

fixes for interger-type vectors; finish imextract upgrade

File:

• branches/eam_branch_20081124/Ohana/src/opihi/dvo/mextract.c (modified) (5 diffs)

branches/eam_branch_20081124/Ohana/src/opihi/dvo/mextract.c

@@ -11 +11 @@
   Catalog catalog;
   SkyList *skylist;
-  PhotCode *code;
   Vector **vec;
   dbField *fields;
@@ -18 +17 @@
 
   /* defaults */
+  vec = NULL;
+  stack = NULL;
+  fields = NULL;
+  values = NULL;
   skylist = NULL;
-  code = NULL;
-  fields = NULL;
-  stack = NULL;
+  selection = NULL;
 
   if ((N = get_argument (argc, argv, "-h"))) goto help;
@@ -49 +50 @@
   fields = dbCmdlineFields (argc, argv, DVO_TABLE_MEASURE, &last, &Nfields);
   if (fields == NULL) return (FALSE);
+  if (Nfields == 0) {
+    FreeSkyRegionSelection (selection);
+    dbFreeFields (fields, Nfields);
+    dvo_catalog_free (&catalog);
+    goto help;
+  }
 
   // examine line for 'where' or 'match to'.  'match to' is forbidden
@@ -168 +175 @@
   }
 
-  free (values);
+  if (vec) free (vec);
+  if (values) free (values);
   dbFreeFields (fields, Nfields);
   dbFreeStack (stack, Nstack);
@@ -178 +186 @@
 
 escape:
+  if (vec) free (vec);
   free (values);
   dbFreeFields (fields, Nfields);