Index: trunk/Ohana/src/opihi/cmd.astro/ctimes.c
===================================================================
--- trunk/Ohana/src/opihi/cmd.astro/ctimes.c	(revision 14517)
+++ trunk/Ohana/src/opihi/cmd.astro/ctimes.c	(revision 14590)
@@ -29,5 +29,5 @@
     value = atof (argv[2]);
     time = TimeRef (value, TimeReference, TimeFormat);
-    date = sec_to_date (time);
+    date = ohana_sec_to_date (time);
     
     if (Variable != (char *) NULL) {
@@ -48,5 +48,5 @@
     }
 
-    if (!str_to_time (argv[2], &time)) { 
+    if (!ohana_str_to_time (argv[2], &time)) { 
       gprint (GP_ERR, "syntax error\n");
       return (FALSE);
Index: trunk/Ohana/src/opihi/cmd.astro/getlst.c
===================================================================
--- trunk/Ohana/src/opihi/cmd.astro/getlst.c	(revision 14517)
+++ trunk/Ohana/src/opihi/cmd.astro/getlst.c	(revision 14590)
@@ -16,5 +16,5 @@
   if (argc != 3) goto syntax;
 
-  if (!str_to_time (argv[1], &time)) {
+  if (!ohana_str_to_time (argv[1], &time)) {
       if (Variable != NULL) free (Variable);
       return (FALSE);
@@ -23,5 +23,5 @@
   longitude = atof (argv[2]);
 
-  jd = sec_to_jd (time);
+  jd = ohana_sec_to_jd (time);
   fprintf (stderr, "jd: %f\n", jd);
 
Index: trunk/Ohana/src/opihi/cmd.astro/region.c
===================================================================
--- trunk/Ohana/src/opihi/cmd.astro/region.c	(revision 14517)
+++ trunk/Ohana/src/opihi/cmd.astro/region.c	(revision 14590)
@@ -58,5 +58,5 @@
   }
   
-  if (!str_to_radec (&Ra, &Dec, argv[1], argv[2])) return (FALSE);
+  if (!ohana_str_to_radec (&Ra, &Dec, argv[1], argv[2])) return (FALSE);
   Radius = atof (argv[3]);
   strcpy (graphmode.coords.ctype, "RA---TAN");
Index: trunk/Ohana/src/opihi/cmd.astro/sexigesimal.c
===================================================================
--- trunk/Ohana/src/opihi/cmd.astro/sexigesimal.c	(revision 14517)
+++ trunk/Ohana/src/opihi/cmd.astro/sexigesimal.c	(revision 14590)
@@ -23,5 +23,5 @@
 
   if (HMS) {
-    if (!dms_to_ddd (&value, argv[1])) {
+    if (!ohana_dms_to_ddd (&value, argv[1])) {
       gprint (GP_ERR, "syntax error in input\n");
       return (FALSE);
Index: trunk/Ohana/src/opihi/cmd.data/close.c
===================================================================
--- trunk/Ohana/src/opihi/cmd.data/close.c	(revision 14517)
+++ trunk/Ohana/src/opihi/cmd.data/close.c	(revision 14590)
@@ -3,5 +3,5 @@
 int close_device (int argc, char **argv) {
 
-  int N, kapa, IsImage;
+  int N, kapa;
   char *name;
   /* close current graphics device */
Index: trunk/Ohana/src/opihi/cmd.data/dbconnect.c
===================================================================
--- trunk/Ohana/src/opihi/cmd.data/dbconnect.c	(revision 14517)
+++ trunk/Ohana/src/opihi/cmd.data/dbconnect.c	(revision 14590)
@@ -8,11 +8,7 @@
 int dbconnect (int argc, char **argv) {
   
-  char c;
-  int i;
-  int Nrows;
   char query[256];
   char password[1024];
   MYSQL_RES *result;
-  MYSQL_ROW row;
 
   if (argc != 4) {
@@ -25,4 +21,7 @@
 
 # if (0)
+  int i;
+  char c;
+
   initscr();
   noecho();
@@ -65,4 +64,7 @@
     
 # if (0)
+  int Nrows;
+  MYSQL_ROW row;
+
   sprintf (query, "select @@interactive_timeout");
   if (mysql_query (connection, query)) {
Index: trunk/Ohana/src/opihi/cmd.data/device.c
===================================================================
--- trunk/Ohana/src/opihi/cmd.data/device.c	(revision 14517)
+++ trunk/Ohana/src/opihi/cmd.data/device.c	(revision 14590)
@@ -3,5 +3,5 @@
 int device (int argc, char **argv) {
 
-  int N, kapa, IsImage;
+  int N, kapa;
   char *name;;
   /* set / get current graphics device */
@@ -18,5 +18,5 @@
     if (name == NULL) {
       gprint (GP_ERR, "no device defined\n");
-      return (NULL);
+      return (FALSE);
     }
   } else {
Index: trunk/Ohana/src/opihi/cmd.data/jpeg.c
===================================================================
--- trunk/Ohana/src/opihi/cmd.data/jpeg.c	(revision 14517)
+++ trunk/Ohana/src/opihi/cmd.data/jpeg.c	(revision 14590)
@@ -4,5 +4,5 @@
 
   char filename[1024];
-  int N, kapa, IsImage, IsPNG, IsPPM;
+  int N, kapa, IsPNG, IsPPM;
   char *name;
   
Index: trunk/Ohana/src/opihi/cmd.data/ps.c
===================================================================
--- trunk/Ohana/src/opihi/cmd.data/ps.c	(revision 14517)
+++ trunk/Ohana/src/opihi/cmd.data/ps.c	(revision 14590)
@@ -4,5 +4,5 @@
 
   char filename[1024], pagename[1024], *name;
-  int N, kapa, scaleMode, pageMode, IsImage;
+  int N, kapa, scaleMode, pageMode;
   
   if ((N = get_argument (argc, argv, "--help"))) goto help;
Index: trunk/Ohana/src/opihi/cmd.data/zplot.c
===================================================================
--- trunk/Ohana/src/opihi/cmd.data/zplot.c	(revision 14517)
+++ trunk/Ohana/src/opihi/cmd.data/zplot.c	(revision 14590)
@@ -3,5 +3,5 @@
 int zplot (int argc, char **argv) {
   
-  int i, kapa, N, Npts;
+  int i, kapa, Npts;
   float *in, *out;
   double min, range;
Index: trunk/Ohana/src/opihi/dimm/Telescope.c
===================================================================
--- trunk/Ohana/src/opihi/dimm/Telescope.c	(revision 14517)
+++ trunk/Ohana/src/opihi/dimm/Telescope.c	(revision 14590)
@@ -37,5 +37,5 @@
   if (!status) return (FALSE);
 
-  status = str_to_radec (r, d, rastr, decstr);
+  status = ohana_str_to_radec (r, d, rastr, decstr);
   if (!status) return (FALSE);
 
@@ -207,9 +207,9 @@
 
   SerialCommand (":GA#", &answer, SER_TIMEOUT);
-  dms_to_ddd (x, answer);
+  ohana_dms_to_ddd (x, answer);
   free (answer);
 
   SerialCommand (":GZ#", &answer, SER_TIMEOUT);
-  dms_to_ddd (y, answer);
+  ohana_dms_to_ddd (y, answer);
   free (answer);
 
@@ -312,15 +312,15 @@
   /* : get latitude */
   SerialCommand (":Gt#", &answer, SER_TIMEOUT);
-  dms_to_ddd (lat, answer);
+  ohana_dms_to_ddd (lat, answer);
   free (answer);
 
   /* : get longitude */
   SerialCommand (":Gg#", &answer, SER_TIMEOUT);
-  dms_to_ddd (lon, answer);
+  ohana_dms_to_ddd (lon, answer);
   free (answer);
 
   /* : get LST */
   SerialCommand (":GS#", &answer, SER_TIMEOUT);
-  dms_to_ddd (lst, answer);
+  ohana_dms_to_ddd (lst, answer);
   free (answer);
 
Index: trunk/Ohana/src/opihi/dvo/ImageOps.c
===================================================================
--- trunk/Ohana/src/opihi/dvo/ImageOps.c	(revision 14517)
+++ trunk/Ohana/src/opihi/dvo/ImageOps.c	(revision 14590)
@@ -27,5 +27,10 @@
 
   if (selection->useSkyregion) {
-    get_skyregion (&patch.Rmin, &patch.Rmax, &patch.Dmin, &patch.Dmax);
+    double Rs, Re, Ds, De;
+    get_skyregion (&Rs, &Re, &Ds, &De);
+    patch.Rmin = Rs;
+    patch.Rmax = Re;
+    patch.Dmin = Ds;
+    patch.Dmax = De;
     Rmin = patch.Rmin - 182.0;
     Rmax = patch.Rmax + 182.0;
Index: trunk/Ohana/src/opihi/dvo/ImageSelection.c
===================================================================
--- trunk/Ohana/src/opihi/dvo/ImageSelection.c	(revision 14517)
+++ trunk/Ohana/src/opihi/dvo/ImageSelection.c	(revision 14590)
@@ -11,5 +11,4 @@
 int SetImageSelection (int mosaicMode, SkyRegionSelection *selection) {
 
-  int Ngraph;
   int TimeSelect;
   time_t tzero, tend;
Index: trunk/Ohana/src/opihi/dvo/avextract.c
===================================================================
--- trunk/Ohana/src/opihi/dvo/avextract.c	(revision 14517)
+++ trunk/Ohana/src/opihi/dvo/avextract.c	(revision 14590)
@@ -5,5 +5,4 @@
   int i, j, n, m, N, Npts, NPTS, last, Nfields, Nreturn, Ncstack, Nstack;
   int Nsecfilt, mode, VERBOSE;
-  char *p;
   char **cstack, name[1024];
   float *values;
@@ -135,8 +134,4 @@
   return (TRUE);
 
- usage:
-  gprint (GP_ERR, "USAGE: avextract (value) [options]\n");
-  gprint (GP_ERR, "  value: average.parameter or photcode\n");
-
  escape:
   dbFreeFields (fields, Nfields);
Index: trunk/Ohana/src/opihi/dvo/calextract.c
===================================================================
--- trunk/Ohana/src/opihi/dvo/calextract.c	(revision 14517)
+++ trunk/Ohana/src/opihi/dvo/calextract.c	(revision 14590)
@@ -5,7 +5,6 @@
 int calextract (int argc, char **argv) {
   
-  int i, j, m, N, Nr, mode[2];
+  int i, N, Nr, mode[2];
   int Nsecfilt, NSTAR;
-  double M1, M2, dM2, color;
 
   PhotCode *code[2];
Index: trunk/Ohana/src/opihi/dvo/calmextract.c
===================================================================
--- trunk/Ohana/src/opihi/dvo/calmextract.c	(revision 14517)
+++ trunk/Ohana/src/opihi/dvo/calmextract.c	(revision 14590)
@@ -6,7 +6,6 @@
 int calmextract (int argc, char **argv) {
   
-  int i, j, k, m, N, N1, Nr, mode[2];
+  int i, k, N, Nr, mode[2];
   int NSTAR, Nstar, Nsecfilt;
-  double *M1, M2, dM2, color;
 
   Catalog catalog;
Index: trunk/Ohana/src/opihi/dvo/dbCmdlineFields.c
===================================================================
--- trunk/Ohana/src/opihi/dvo/dbCmdlineFields.c	(revision 14517)
+++ trunk/Ohana/src/opihi/dvo/dbCmdlineFields.c	(revision 14590)
@@ -4,5 +4,5 @@
 dbField *dbCmdlineFields (int argc, char **argv, int table, int *last, int *nfields) {
 
-  int i, j, status, Nfields, NFIELDS;
+  int i, status, Nfields, NFIELDS;
   char *p, *q, *field;
   dbField *fields;
Index: trunk/Ohana/src/opihi/dvo/dbExtractMeasures.c
===================================================================
--- trunk/Ohana/src/opihi/dvo/dbExtractMeasures.c	(revision 14517)
+++ trunk/Ohana/src/opihi/dvo/dbExtractMeasures.c	(revision 14590)
@@ -12,5 +12,5 @@
 double dbExtractMeasures (Average *average, SecFilt *secfilt, Measure *measure, dbField *field) {
 
-  int i, Nsec;
+  int Nsec;
   double value;
   double ra, dec, x, y;
@@ -116,18 +116,7 @@
       value = average[0].Nn;
       break;
-    case MEAS_NPHOT: /* OK */
-      Nsec = f(measure[0].photcode);
-      value = secfilt[Nsec].Nused;
-      break;
-    case MEAS_NCODE: /* OK */
-      Nsec = f(measure[0].photcode);
-      value = secfilt[Nsec].Ncode;
-      break;
     case MEAS_OBJFLAGS: /* OK */
       value = average[0].code;
       break;
-//    case MEAS_dMAG: /* OK */
-//      value = measure[0].dM;
-//      break;
     // note that these represent the ra displacement relative to the average, not 
     // the error.
Index: trunk/Ohana/src/opihi/dvo/dbFields.c
===================================================================
--- trunk/Ohana/src/opihi/dvo/dbFields.c	(revision 14517)
+++ trunk/Ohana/src/opihi/dvo/dbFields.c	(revision 14590)
@@ -122,6 +122,4 @@
   if (!strcasecmp (fieldName, "nmeas"))    ESCAPE (MEAS_NMEAS,       	MAG_NONE);
   if (!strcasecmp (fieldName, "nmiss"))    ESCAPE (MEAS_NMISS,       	MAG_NONE);
-  if (!strcasecmp (fieldName, "nphot"))    ESCAPE (MEAS_NPHOT,       	MAG_NONE);
-  if (!strcasecmp (fieldName, "ncode"))    ESCAPE (MEAS_NCODE,       	MAG_NONE);
   if (!strcasecmp (fieldName, "objflags")) ESCAPE (MEAS_OBJFLAGS,     	MAG_NONE);
   if (!strcasecmp (fieldName, "AIRMASS"))  ESCAPE (MEAS_AIRMASS,     	MAG_NONE);
Index: trunk/Ohana/src/opihi/dvo/detrend.c
===================================================================
--- trunk/Ohana/src/opihi/dvo/detrend.c	(revision 14517)
+++ trunk/Ohana/src/opihi/dvo/detrend.c	(revision 14590)
@@ -27,10 +27,10 @@
   if ((N = get_argument (argc, argv, "-time"))) {
     remove_argument (N, &argc, argv);
-    if (!str_to_time (argv[N], &tzero)) { 
-      gprint (GP_ERR, "syntax error\n");
-      return (FALSE);
-    }
-    remove_argument (N, &argc, argv);
-    if (!str_to_dtime (argv[N], &trange)) { 
+    if (!ohana_str_to_time (argv[N], &tzero)) { 
+      gprint (GP_ERR, "syntax error\n");
+      return (FALSE);
+    }
+    remove_argument (N, &argc, argv);
+    if (!ohana_str_to_dtime (argv[N], &trange)) { 
       gprint (GP_ERR, "syntax error\n");
       return (FALSE);
@@ -45,10 +45,10 @@
   if ((N = get_argument (argc, argv, "-trange"))) {
     remove_argument (N, &argc, argv);
-    if (!str_to_time (argv[N], &tzero)) { 
-      gprint (GP_ERR, "syntax error\n");
-      return (FALSE);
-    }
-    remove_argument (N, &argc, argv);
-    if (!str_to_time (argv[N], &tend)) { 
+    if (!ohana_str_to_time (argv[N], &tzero)) { 
+      gprint (GP_ERR, "syntax error\n");
+      return (FALSE);
+    }
+    remove_argument (N, &argc, argv);
+    if (!ohana_str_to_time (argv[N], &tend)) { 
       gprint (GP_ERR, "syntax error\n");
       return (FALSE);
Index: trunk/Ohana/src/opihi/dvo/dmt.c
===================================================================
--- trunk/Ohana/src/opihi/dvo/dmt.c	(revision 14517)
+++ trunk/Ohana/src/opihi/dvo/dmt.c	(revision 14590)
@@ -4,4 +4,10 @@
 int dmt (int argc, char **argv) {
   
+  // XXX this needs to be fixed: how to access different graphs at once?
+  gprint (GP_ERR, "ERROR: this function is currently disabled\n");
+  return (FALSE);
+
+# if (0)
+
   int i, m, k, N, kapa, SaveVectors;
   int Nsec, Nsecfilt, NPTS;
@@ -38,7 +44,4 @@
   }
 
-  // XXX this needs to be fixed: how to access different graphs at once?
-  gprint (GP_ERR, "ERROR: this function is currently disabled\n");
-  return (FALSE);
   if (!GetGraphData (&graphsky, &kapa, NULL)) return (FALSE);
   if (!GetGraph (&graphmode, NULL, NULL)) return (FALSE);
@@ -151,4 +154,4 @@
   }
   return (TRUE);
-
+# endif 
 }
Index: trunk/Ohana/src/opihi/dvo/gimages.c
===================================================================
--- trunk/Ohana/src/opihi/dvo/gimages.c	(revision 14517)
+++ trunk/Ohana/src/opihi/dvo/gimages.c	(revision 14590)
@@ -30,10 +30,10 @@
   if ((N = get_argument (argc, argv, "-time"))) {
     remove_argument (N, &argc, argv);
-    if (!str_to_time (argv[N], &tzero)) { 
+    if (!ohana_str_to_time (argv[N], &tzero)) { 
       gprint (GP_ERR, "syntax error\n");
       return (FALSE);
     }
     remove_argument (N, &argc, argv);
-    if (!str_to_dtime (argv[N], &trange)) { 
+    if (!ohana_str_to_dtime (argv[N], &trange)) { 
       gprint (GP_ERR, "syntax error\n");
       return (FALSE);
@@ -50,5 +50,5 @@
     remove_argument (N, &argc, argv);
 
-    if (!str_to_dtime (argv[N], &trange)) { 
+    if (!ohana_str_to_dtime (argv[N], &trange)) { 
       gprint (GP_ERR, "syntax error\n");
       return (FALSE);
@@ -80,5 +80,5 @@
   }
 
-  if (!str_to_radec (&Ra, &Dec, argv[1], argv[2])) return (FALSE);
+  if (!ohana_str_to_radec (&Ra, &Dec, argv[1], argv[2])) return (FALSE);
 
   if ((image = LoadImages (&Nimage)) == NULL) return (FALSE);
@@ -89,5 +89,4 @@
   int TriangleUp   = wordhash ("TRP-");
   int TriangleDn   = wordhash ("TRM-");
-  int TrianglePts  = wordhash ("TRI-");
 
   Nfound = 0;
@@ -149,5 +148,5 @@
 
   got_spot:
-    date = sec_to_date (image[i].tzero);
+    date = ohana_sec_to_date (image[i].tzero);
 
     if (PixelCoords) {
Index: trunk/Ohana/src/opihi/dvo/gstar.c
===================================================================
--- trunk/Ohana/src/opihi/dvo/gstar.c	(revision 14517)
+++ trunk/Ohana/src/opihi/dvo/gstar.c	(revision 14590)
@@ -168,5 +168,5 @@
 
 	  if (GetMeasures && !QUIET) {
-	    date = sec_to_date (catalog.measure[m].t);
+	    date = ohana_sec_to_date (catalog.measure[m].t);
 	    gprint (GP_LOG, "%6.3f %6.3f %5.3f  %20s  %5.2f %5.2f %2d %3x %3d %-20s\n", 
 		     Mcat, Mrel, catalog.measure[m].dM,
Index: trunk/Ohana/src/opihi/dvo/images.c
===================================================================
--- trunk/Ohana/src/opihi/dvo/images.c	(revision 14517)
+++ trunk/Ohana/src/opihi/dvo/images.c	(revision 14590)
@@ -61,10 +61,10 @@
   if ((N = get_argument (argc, argv, "-time"))) {
     remove_argument (N, &argc, argv);
-    if (!str_to_time (argv[N], &tzero)) { 
-      gprint (GP_ERR, "syntax error\n");
-      return (FALSE);
-    }
-    remove_argument (N, &argc, argv);
-    if (!str_to_dtime (argv[N], &trange)) { 
+    if (!ohana_str_to_time (argv[N], &tzero)) { 
+      gprint (GP_ERR, "syntax error\n");
+      return (FALSE);
+    }
+    remove_argument (N, &argc, argv);
+    if (!ohana_str_to_dtime (argv[N], &trange)) { 
       gprint (GP_ERR, "syntax error\n");
       return (FALSE);
@@ -79,10 +79,10 @@
   if ((N = get_argument (argc, argv, "-trange"))) {
     remove_argument (N, &argc, argv);
-    if (!str_to_time (argv[N], &tzero)) { 
-      gprint (GP_ERR, "syntax error\n");
-      return (FALSE);
-    }
-    remove_argument (N, &argc, argv);
-    if (!str_to_time (argv[N], &tend)) { 
+    if (!ohana_str_to_time (argv[N], &tzero)) { 
+      gprint (GP_ERR, "syntax error\n");
+      return (FALSE);
+    }
+    remove_argument (N, &argc, argv);
+    if (!ohana_str_to_time (argv[N], &tend)) { 
       gprint (GP_ERR, "syntax error\n");
       return (FALSE);
Index: trunk/Ohana/src/opihi/dvo/imdata.c
===================================================================
--- trunk/Ohana/src/opihi/dvo/imdata.c	(revision 14517)
+++ trunk/Ohana/src/opihi/dvo/imdata.c	(revision 14590)
@@ -26,10 +26,10 @@
   if ((N = get_argument (argc, argv, "-time"))) {
     remove_argument (N, &argc, argv);
-    if (!str_to_time (argv[N], &tzero)) { 
+    if (!ohana_str_to_time (argv[N], &tzero)) { 
       gprint (GP_ERR, "syntax error\n");
       return (FALSE);
     }
     remove_argument (N, &argc, argv);
-    if (!str_to_dtime (argv[N], &trange)) { 
+    if (!ohana_str_to_dtime (argv[N], &trange)) { 
       gprint (GP_ERR, "syntax error\n");
       return (FALSE);
Index: trunk/Ohana/src/opihi/dvo/imextract.c
===================================================================
--- trunk/Ohana/src/opihi/dvo/imextract.c	(revision 14517)
+++ trunk/Ohana/src/opihi/dvo/imextract.c	(revision 14590)
@@ -6,5 +6,5 @@
   
   int i, j, Nimage, mode, N, PhotcodeSelect;
-  int TimeSelect, RegionSelect, *subset, Nsubset, TimeFormat, FlagSelect, FlagValue;
+  int TimeSelect, *subset, Nsubset, TimeFormat, FlagSelect, FlagValue;
   double x, y, ra, dec, t, trange;
   time_t tzero, TimeReference;
@@ -27,10 +27,10 @@
   if ((N = get_argument (argc, argv, "-time"))) {
     remove_argument (N, &argc, argv);
-    if (!str_to_time (argv[N], &tzero)) { 
+    if (!ohana_str_to_time (argv[N], &tzero)) { 
       gprint (GP_ERR, "syntax error\n");
       return (FALSE);
     }
     remove_argument (N, &argc, argv);
-    if (!str_to_dtime (argv[N], &trange)) { 
+    if (!ohana_str_to_dtime (argv[N], &trange)) { 
       gprint (GP_ERR, "syntax error\n");
       return (FALSE);
Index: trunk/Ohana/src/opihi/dvo/imlist.c
===================================================================
--- trunk/Ohana/src/opihi/dvo/imlist.c	(revision 14517)
+++ trunk/Ohana/src/opihi/dvo/imlist.c	(revision 14590)
@@ -21,10 +21,10 @@
   if ((N = get_argument (argc, argv, "-time"))) {
     remove_argument (N, &argc, argv);
-    if (!str_to_time (argv[N], &tzero)) { 
+    if (!ohana_str_to_time (argv[N], &tzero)) { 
       gprint (GP_ERR, "syntax error\n");
       return (FALSE);
     }
     remove_argument (N, &argc, argv);
-    if (!str_to_dtime (argv[N], &trange)) { 
+    if (!ohana_str_to_dtime (argv[N], &trange)) { 
       gprint (GP_ERR, "syntax error\n");
       return (FALSE);
Index: trunk/Ohana/src/opihi/dvo/imphot.c
===================================================================
--- trunk/Ohana/src/opihi/dvo/imphot.c	(revision 14517)
+++ trunk/Ohana/src/opihi/dvo/imphot.c	(revision 14590)
@@ -40,9 +40,9 @@
 
   /* load image(s) in time range given */
-  if (!str_to_time (argv[1], &tzero)) { 
+  if (!ohana_str_to_time (argv[1], &tzero)) { 
     gprint (GP_ERR, "syntax error\n");
     return (FALSE);
   }
-  if (!str_to_dtime (argv[2], &trange)) { 
+  if (!ohana_str_to_dtime (argv[2], &trange)) { 
     gprint (GP_ERR, "syntax error\n");
     return (FALSE);
Index: trunk/Ohana/src/opihi/dvo/imrough.c
===================================================================
--- trunk/Ohana/src/opihi/dvo/imrough.c	(revision 14517)
+++ trunk/Ohana/src/opihi/dvo/imrough.c	(revision 14590)
@@ -23,10 +23,10 @@
   if ((N = get_argument (argc, argv, "-time"))) {
     remove_argument (N, &argc, argv);
-    if (!str_to_time (argv[N], &tzero)) { 
+    if (!ohana_str_to_time (argv[N], &tzero)) { 
       gprint (GP_ERR, "syntax error\n");
       return (FALSE);
     }
     remove_argument (N, &argc, argv);
-    if (!str_to_dtime (argv[N], &trange)) { 
+    if (!ohana_str_to_dtime (argv[N], &trange)) { 
       gprint (GP_ERR, "syntax error\n");
       return (FALSE);
@@ -41,10 +41,10 @@
   if ((N = get_argument (argc, argv, "-trange"))) {
     remove_argument (N, &argc, argv);
-    if (!str_to_time (argv[N], &tzero)) { 
+    if (!ohana_str_to_time (argv[N], &tzero)) { 
       gprint (GP_ERR, "syntax error\n");
       return (FALSE);
     }
     remove_argument (N, &argc, argv);
-    if (!str_to_time (argv[N], &tend)) { 
+    if (!ohana_str_to_time (argv[N], &tend)) { 
       gprint (GP_ERR, "syntax error\n");
       return (FALSE);
Index: trunk/Ohana/src/opihi/dvo/imsearch.c
===================================================================
--- trunk/Ohana/src/opihi/dvo/imsearch.c	(revision 14517)
+++ trunk/Ohana/src/opihi/dvo/imsearch.c	(revision 14590)
@@ -25,10 +25,10 @@
   if ((N = get_argument (argc, argv, "-time"))) {
     remove_argument (N, &argc, argv);
-    if (!str_to_time (argv[N], &tzero)) { 
+    if (!ohana_str_to_time (argv[N], &tzero)) { 
       gprint (GP_ERR, "syntax error\n");
       return (FALSE);
     }
     remove_argument (N, &argc, argv);
-    if (!str_to_dtime (argv[N], &trange)) { 
+    if (!ohana_str_to_dtime (argv[N], &trange)) { 
       gprint (GP_ERR, "syntax error\n");
       return (FALSE);
Index: trunk/Ohana/src/opihi/dvo/mextract.c
===================================================================
--- trunk/Ohana/src/opihi/dvo/mextract.c	(revision 14517)
+++ trunk/Ohana/src/opihi/dvo/mextract.c	(revision 14590)
@@ -3,8 +3,6 @@
 int mextract (int argc, char **argv) {
   
-  int i, j, k, m, n, N, N1, Npts, NPTS, last, Nfields, Nreturn, Ncstack, Nstack;
+  int i, j, k, m, n, N, Npts, NPTS, last, Nfields, Nreturn, Ncstack, Nstack;
   int Nsecfilt, VERBOSE, loadImages, mosaicMode;
-  char *p;
-  double *M1;
   char **cstack, name[1024];
   float *values;
@@ -24,4 +22,7 @@
   fields = NULL;
   stack = NULL;
+
+  if ((N = get_argument (argc, argv, "-h"))) goto help;
+  if ((N = get_argument (argc, argv, "--help"))) goto help;
 
   VERBOSE = FALSE;
@@ -159,9 +160,4 @@
   FreeSkyRegionSelection (selection);
   return (TRUE);
-
-usage:
-  gprint (GP_ERR, "USAGE: mextract (value) [options]\n");
-  gprint (GP_ERR, "  value: measure.parameter or photcode\n");
-  return (FALSE);
 
 escape:
Index: trunk/Ohana/src/opihi/dvo/photometry.c
===================================================================
--- trunk/Ohana/src/opihi/dvo/photometry.c	(revision 14517)
+++ trunk/Ohana/src/opihi/dvo/photometry.c	(revision 14590)
@@ -443,10 +443,10 @@
   if ((N = get_argument (*argc, argv, "-time"))) {
     remove_argument (N, argc, argv);
-    if (!str_to_time (argv[N], &tzero)) { 
+    if (!ohana_str_to_time (argv[N], &tzero)) { 
       gprint (GP_ERR, "syntax error\n");
       return (FALSE);
     }
     remove_argument (N, argc, argv);
-    if (!str_to_dtime (argv[N], &trange)) { 
+    if (!ohana_str_to_dtime (argv[N], &trange)) { 
       gprint (GP_ERR, "syntax error\n");
       return (FALSE);
Index: trunk/Ohana/src/opihi/dvo/pmeasure.c
===================================================================
--- trunk/Ohana/src/opihi/dvo/pmeasure.c	(revision 14517)
+++ trunk/Ohana/src/opihi/dvo/pmeasure.c	(revision 14590)
@@ -127,5 +127,5 @@
 	if ((R < Rmin) || (R > Rmax) || (D < -90.0) || (D > 90.0)) {
 	  char *date;
-	  date = sec_to_date (catalog.measure[m+k].t);
+	  date = ohana_sec_to_date (catalog.measure[m+k].t);
 	  gprint (GP_LOG, "out: %f, %f : %s : (%f, %f) + (%f, %f)\n", R, D, date, catalog.average[i].R, catalog.average[i].D, catalog.measure[m+k].dR/3600.0, catalog.measure[m+k].dD/3600.0);
 	  free (date);
Index: trunk/Ohana/src/opihi/dvo/skycoverage.c
===================================================================
--- trunk/Ohana/src/opihi/dvo/skycoverage.c	(revision 14517)
+++ trunk/Ohana/src/opihi/dvo/skycoverage.c	(revision 14590)
@@ -24,10 +24,10 @@
   if ((N = get_argument (argc, argv, "-time"))) {
     remove_argument (N, &argc, argv);
-    if (!str_to_time (argv[N], &tzero)) { 
+    if (!ohana_str_to_time (argv[N], &tzero)) { 
       gprint (GP_ERR, "syntax error\n");
       return (FALSE);
     }
     remove_argument (N, &argc, argv);
-    if (!str_to_dtime (argv[N], &trange)) { 
+    if (!ohana_str_to_dtime (argv[N], &trange)) { 
       gprint (GP_ERR, "syntax error\n");
       return (FALSE);
@@ -42,10 +42,10 @@
   if ((N = get_argument (argc, argv, "-trange"))) {
     remove_argument (N, &argc, argv);
-    if (!str_to_time (argv[N], &tzero)) { 
+    if (!ohana_str_to_time (argv[N], &tzero)) { 
       gprint (GP_ERR, "syntax error\n");
       return (FALSE);
     }
     remove_argument (N, &argc, argv);
-    if (!str_to_time (argv[N], &tend)) { 
+    if (!ohana_str_to_time (argv[N], &tend)) { 
       gprint (GP_ERR, "syntax error\n");
       return (FALSE);
Index: trunk/Ohana/src/opihi/dvo/subpix.c
===================================================================
--- trunk/Ohana/src/opihi/dvo/subpix.c	(revision 14517)
+++ trunk/Ohana/src/opihi/dvo/subpix.c	(revision 14590)
@@ -28,5 +28,5 @@
     return (FALSE);
   }
-  if (!str_to_radec (&Ra, &Dec, argv[1], argv[2])) return (FALSE);
+  if (!ohana_str_to_radec (&Ra, &Dec, argv[1], argv[2])) return (FALSE);
   if (Ra < 0) Ra += 360.0;
   if (Ra > 360.0) Ra -= 360.0;
Index: trunk/Ohana/src/opihi/include/convert.h
===================================================================
--- trunk/Ohana/src/opihi/include/convert.h	(revision 14517)
+++ trunk/Ohana/src/opihi/include/convert.h	(revision 14590)
@@ -15,6 +15,6 @@
 int           day_to_sec            PROTO((char *string, time_t *second));
 int           hms_to_sec            PROTO((char *string, time_t *second));
-char         *sec_to_hms            PROTO((time_t second));
-char         *sec_to_day            PROTO((time_t second));
+char         *ohana_sec_to_hms      PROTO((time_t second));
+char         *ohana_sec_to_day      PROTO((time_t second));
 
 char         *meade_deg_to_str      PROTO((double deg));
Index: trunk/Ohana/src/opihi/include/dvoshell.h
===================================================================
--- trunk/Ohana/src/opihi/include/dvoshell.h	(revision 14517)
+++ trunk/Ohana/src/opihi/include/dvoshell.h	(revision 14590)
@@ -42,6 +42,4 @@
       MEAS_NMEAS, 
       MEAS_NMISS, 
-      MEAS_NPHOT, 
-      MEAS_NCODE, 
       MEAS_OBJFLAGS, 
       MEAS_MAG, 
@@ -170,5 +168,4 @@
 Image        *LoadImages            PROTO((int *Nimage));
 Image        *MatchImage            PROTO((unsigned int time, short int source));
-Image        *MatchImage            PROTO((unsigned int time, short int source));
 Coords       *MatchMosaic           PROTO((unsigned int time, short int source));
 int           Quality               PROTO((Measure *measure, int IsDophot));
@@ -227,3 +224,10 @@
 char        *strfloat               PROTO((float value));
 
+int get_skyregion (double *Rs, double *Re, double *Ds, double *De);
+int set_skyregion (double Rs, double Re, double Ds, double De);
+void FreeImageSelection ();
+
+void FreeSkyRegionSelection (SkyRegionSelection *selection);
+int wordhash (char *word);
+
 # endif
Index: trunk/Ohana/src/opihi/include/imfit.h
===================================================================
--- trunk/Ohana/src/opihi/include/imfit.h	(revision 14517)
+++ trunk/Ohana/src/opihi/include/imfit.h	(revision 14590)
@@ -14,7 +14,7 @@
 void sgauss_setup (char *name);
 void qgauss_setup (char *name);
-void Pgauss_setup (char *name);
-void Sgauss_setup (char *name);
-void Qgauss_setup (char *name);
 void qfgauss_setup (char *name);
 void qrgauss_setup (char *name);
+void pgauss_psf_setup (char *name);
+void qgauss_psf_setup (char *name);
+void sgauss_psf_setup (char *name);
Index: trunk/Ohana/src/opihi/include/pcontrol.h
===================================================================
--- trunk/Ohana/src/opihi/include/pcontrol.h	(revision 14517)
+++ trunk/Ohana/src/opihi/include/pcontrol.h	(revision 14590)
@@ -216,4 +216,6 @@
 void   LinkJobAndHost (Job *job, Host *host);
 
+void pcontrol_exit (int n);
+
 // Job   *FindJobByID (IDtype JobID, int *StackID);
 // Job   *FindJobInStackByID (int StackID, int ID);
Index: trunk/Ohana/src/opihi/lib.data/convert.c
===================================================================
--- trunk/Ohana/src/opihi/lib.data/convert.c	(revision 14517)
+++ trunk/Ohana/src/opihi/lib.data/convert.c	(revision 14590)
@@ -117,5 +117,5 @@
 
 /***** convert seconds to HH:MM:SS ****/
-char *sec_to_hms (time_t second) {
+char *ohana_sec_to_hms (time_t second) {
   
   struct tm *gmt;
@@ -129,5 +129,5 @@
 
 /***** convert seconds to Day@HH:MM:SS ****/
-char *sec_to_day (time_t second) {
+char *ohana_sec_to_day (time_t second) {
   
   struct tm *gmt;
Index: trunk/Ohana/src/opihi/lib.data/open_kapa.c
===================================================================
--- trunk/Ohana/src/opihi/lib.data/open_kapa.c	(revision 14517)
+++ trunk/Ohana/src/opihi/lib.data/open_kapa.c	(revision 14590)
@@ -190,4 +190,5 @@
   }
   KapaSetGraphData (Socket[Active], data);
+  return (TRUE);
 }
 
@@ -254,4 +255,5 @@
   }
   KapaSetImageData (Socket[Active], data);
+  return (TRUE);
 }
 
Index: trunk/Ohana/src/opihi/lib.shell/timeformat.c
===================================================================
--- trunk/Ohana/src/opihi/lib.shell/timeformat.c	(revision 14517)
+++ trunk/Ohana/src/opihi/lib.shell/timeformat.c	(revision 14590)
@@ -7,5 +7,5 @@
   *TimeReference = 0;
   if ((p = get_variable ("TIMEREF")) != (char *) NULL) {
-    if (!str_to_time (p, TimeReference)) {
+    if (!ohana_str_to_time (p, TimeReference)) {
       gprint (GP_ERR, "error in TIME_REF format\n");
       return (FALSE);
Index: trunk/Ohana/src/opihi/pantasks/CheckController.c
===================================================================
--- trunk/Ohana/src/opihi/pantasks/CheckController.c	(revision 14517)
+++ trunk/Ohana/src/opihi/pantasks/CheckController.c	(revision 14590)
@@ -89,5 +89,4 @@
   if (VerboseMode()) gprint (GP_ERR, "clear %d crash jobs %f\n", i, TimerElapsed(TRUE)); 
 
- finish:
   FlushIOBuffer (&buffer);
   // status = ControllerCommand ("run", CONTROLLER_PROMPT, &buffer);
Index: trunk/Ohana/src/opihi/pantasks/TaskOps.c
===================================================================
--- trunk/Ohana/src/opihi/pantasks/TaskOps.c	(revision 14517)
+++ trunk/Ohana/src/opihi/pantasks/TaskOps.c	(revision 14590)
@@ -104,14 +104,14 @@
 	switch (tasks[i][0].ranges[j].type) {
 	  case RANGE_ABS:
-	    start = sec_to_date (tasks[i][0].ranges[j].start);
-	    stop  = sec_to_date (tasks[i][0].ranges[j].stop);
+	    start = ohana_sec_to_date (tasks[i][0].ranges[j].start);
+	    stop  = ohana_sec_to_date (tasks[i][0].ranges[j].stop);
 	    break;
 	  case RANGE_DAY:
-	    start = sec_to_hms (tasks[i][0].ranges[j].start);
-	    stop  = sec_to_hms (tasks[i][0].ranges[j].stop);
+	    start = ohana_sec_to_hms (tasks[i][0].ranges[j].start);
+	    stop  = ohana_sec_to_hms (tasks[i][0].ranges[j].stop);
 	    break;
 	  case RANGE_WEEK:
-	    start = sec_to_day (tasks[i][0].ranges[j].start);
-	    stop  = sec_to_day (tasks[i][0].ranges[j].stop);
+	    start = ohana_sec_to_day (tasks[i][0].ranges[j].start);
+	    stop  = ohana_sec_to_day (tasks[i][0].ranges[j].stop);
 	    break;
 	  default:
@@ -264,14 +264,14 @@
     switch (tasks[i][0].ranges[j].type) {
       case RANGE_ABS:
-	start = sec_to_date (tasks[i][0].ranges[j].start);
-	stop  = sec_to_date (tasks[i][0].ranges[j].stop);
+	start = ohana_sec_to_date (tasks[i][0].ranges[j].start);
+	stop  = ohana_sec_to_date (tasks[i][0].ranges[j].stop);
 	break;
       case RANGE_DAY:
-	start = sec_to_hms (tasks[i][0].ranges[j].start);
-	stop  = sec_to_hms (tasks[i][0].ranges[j].stop);
+	start = ohana_sec_to_hms (tasks[i][0].ranges[j].start);
+	stop  = ohana_sec_to_hms (tasks[i][0].ranges[j].stop);
 	break;
       case RANGE_WEEK:
-	start = sec_to_day (tasks[i][0].ranges[j].start);
-	stop  = sec_to_day (tasks[i][0].ranges[j].stop);
+	start = ohana_sec_to_day (tasks[i][0].ranges[j].start);
+	stop  = ohana_sec_to_day (tasks[i][0].ranges[j].stop);
 	break;
       default:
Index: trunk/Ohana/src/opihi/pantasks/controller_jobstack.c
===================================================================
--- trunk/Ohana/src/opihi/pantasks/controller_jobstack.c	(revision 14517)
+++ trunk/Ohana/src/opihi/pantasks/controller_jobstack.c	(revision 14590)
@@ -21,5 +21,5 @@
 
   // XXX this has an error?  test this out...
-  sprintf (command, "jobstack", argv[2]);
+  sprintf (command, "jobstack %s", argv[2]);
   InitIOBuffer (&buffer, 0x100);
 
Index: trunk/Ohana/src/opihi/pantasks/flush.c
===================================================================
--- trunk/Ohana/src/opihi/pantasks/flush.c	(revision 14517)
+++ trunk/Ohana/src/opihi/pantasks/flush.c	(revision 14590)
@@ -2,7 +2,4 @@
 
 int flush_jobs (int argc, char **argv) {
-
-  Job *job;
-  int JobID;
 
   if (argc != 2) goto usage;
Index: trunk/Ohana/src/opihi/pantasks/task.c
===================================================================
--- trunk/Ohana/src/opihi/pantasks/task.c	(revision 14517)
+++ trunk/Ohana/src/opihi/pantasks/task.c	(revision 14590)
@@ -4,5 +4,5 @@
 int task (int argc, char **argv) {
 
-  int N, hash;
+  int hash;
   int ThisList, status;
   char *input, *outline;
Index: trunk/Ohana/src/opihi/pantasks/task_trange.c
===================================================================
--- trunk/Ohana/src/opihi/pantasks/task_trange.c	(revision 14517)
+++ trunk/Ohana/src/opihi/pantasks/task_trange.c	(revision 14590)
@@ -69,6 +69,6 @@
   /* this test does not fail sufficiently robustly for invalid inputs */
   /* test for YYYY/MM/DD - both must match */
-  if (str_to_time (argv[1], &range.start)) {
-    if (!str_to_time (argv[2], &range.stop)) {
+  if (ohana_str_to_time (argv[1], &range.start)) {
+    if (!ohana_str_to_time (argv[2], &range.stop)) {
       gprint (GP_ERR, "invalid date/time %s\n", argv[2]);
       goto usage;
Index: trunk/Ohana/src/opihi/pcontrol/HostOps.c
===================================================================
--- trunk/Ohana/src/opihi/pcontrol/HostOps.c	(revision 14517)
+++ trunk/Ohana/src/opihi/pcontrol/HostOps.c	(revision 14590)
@@ -25,4 +25,5 @@
   gprint (GP_ERR, "error: unknown host stack : programming error\n");
   pcontrol_exit (1);
+  return (NULL);
 }
 
@@ -37,4 +38,5 @@
   gprint (GP_ERR, "error: unknown host stack : programming error\n");
   pcontrol_exit (1);
+  return (NULL);
 }
 
Index: trunk/Ohana/src/opihi/pcontrol/JobOps.c
===================================================================
--- trunk/Ohana/src/opihi/pcontrol/JobOps.c	(revision 14517)
+++ trunk/Ohana/src/opihi/pcontrol/JobOps.c	(revision 14590)
@@ -28,4 +28,5 @@
   gprint (GP_ERR, "error: unknown host stack : programming error\n");
   pcontrol_exit (1);
+  return (NULL);
 }
 
@@ -41,4 +42,5 @@
   gprint (GP_ERR, "error: unknown job stack : programming error\n");
   pcontrol_exit (1);
+  return (NULL);
 }
 
Index: trunk/Ohana/src/opihi/pcontrol/ResetJob.c
===================================================================
--- trunk/Ohana/src/opihi/pcontrol/ResetJob.c	(revision 14517)
+++ trunk/Ohana/src/opihi/pcontrol/ResetJob.c	(revision 14590)
@@ -48,4 +48,5 @@
   gprint (GP_ERR, "programming error in GetJobOutput (should not reach here)\n");
   pcontrol_exit (1);
+  return (FALSE);
 }