IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Ignore:
Timestamp:
Aug 21, 2007, 2:10:20 PM (19 years ago)
Author:
eugene
Message:

convert str_to_time and related functions to ohana_...; various cleanups for -Wall -Werror

Location:
trunk/Ohana/src/opihi
Files:
51 edited

Legend:

Unmodified
Added
Removed

  • trunk/Ohana/src/opihi/cmd.astro/ctimes.c

    r7917 r14590  
    2929    value = atof (argv[2]);
    3030    time = TimeRef (value, TimeReference, TimeFormat);
    31     date = sec_to_date (time);
     31    date = ohana_sec_to_date (time);
    3232   
    3333    if (Variable != (char *) NULL) {
    … …  
    4848    }
    4949
    50     if (!str_to_time (argv[2], &time)) {
     50    if (!ohana_str_to_time (argv[2], &time)) {
    5151      gprint (GP_ERR, "syntax error\n");
    5252      return (FALSE);

  • trunk/Ohana/src/opihi/cmd.astro/getlst.c

    r7964 r14590  
    1616  if (argc != 3) goto syntax;
    1717
    18   if (!str_to_time (argv[1], &time)) {
     18  if (!ohana_str_to_time (argv[1], &time)) {
    1919      if (Variable != NULL) free (Variable);
    2020      return (FALSE);
    … …  
    2323  longitude = atof (argv[2]);
    2424
    25   jd = sec_to_jd (time);
     25  jd = ohana_sec_to_jd (time);
    2626  fprintf (stderr, "jd: %f\n", jd);
    2727

  • trunk/Ohana/src/opihi/cmd.astro/region.c

    r14501 r14590  
    5858  }
    5959 
    60   if (!str_to_radec (&Ra, &Dec, argv[1], argv[2])) return (FALSE);
     60  if (!ohana_str_to_radec (&Ra, &Dec, argv[1], argv[2])) return (FALSE);
    6161  Radius = atof (argv[3]);
    6262  strcpy (graphmode.coords.ctype, "RA---TAN");

  • trunk/Ohana/src/opihi/cmd.astro/sexigesimal.c

    r7917 r14590  
    2323
    2424  if (HMS) {
    25     if (!dms_to_ddd (&value, argv[1])) {
     25    if (!ohana_dms_to_ddd (&value, argv[1])) {
    2626      gprint (GP_ERR, "syntax error in input\n");
    2727      return (FALSE);

  • trunk/Ohana/src/opihi/cmd.data/close.c

    r13479 r14590  
    33int close_device (int argc, char **argv) {
    44
    5   int N, kapa, IsImage;
     5  int N, kapa;
    66  char *name;
    77  /* close current graphics device */

  • trunk/Ohana/src/opihi/cmd.data/dbconnect.c

    r13615 r14590  
    88int dbconnect (int argc, char **argv) {
    99 
    10   char c;
    11   int i;
    12   int Nrows;
    1310  char query[256];
    1411  char password[1024];
    1512  MYSQL_RES *result;
    16   MYSQL_ROW row;
    1713
    1814  if (argc != 4) {
    … …  
    2521
    2622# if (0)
     23  int i;
     24  char c;
     25
    2726  initscr();
    2827  noecho();
    … …  
    6564   
    6665# if (0)
     66  int Nrows;
     67  MYSQL_ROW row;
     68
    6769  sprintf (query, "select @@interactive_timeout");
    6870  if (mysql_query (connection, query)) {

  • trunk/Ohana/src/opihi/cmd.data/device.c

    r13479 r14590  
    33int device (int argc, char **argv) {
    44
    5   int N, kapa, IsImage;
     5  int N, kapa;
    66  char *name;;
    77  /* set / get current graphics device */
    … …  
    1818    if (name == NULL) {
    1919      gprint (GP_ERR, "no device defined\n");
    20       return (NULL);
     20      return (FALSE);
    2121    }
    2222  } else {

  • trunk/Ohana/src/opihi/cmd.data/jpeg.c

    r13479 r14590  
    44
    55  char filename[1024];
    6   int N, kapa, IsImage, IsPNG, IsPPM;
     6  int N, kapa, IsPNG, IsPPM;
    77  char *name;
    88 

  • trunk/Ohana/src/opihi/cmd.data/ps.c

    r13479 r14590  
    44
    55  char filename[1024], pagename[1024], *name;
    6   int N, kapa, scaleMode, pageMode, IsImage;
     6  int N, kapa, scaleMode, pageMode;
    77 
    88  if ((N = get_argument (argc, argv, "--help"))) goto help;

  • trunk/Ohana/src/opihi/cmd.data/zplot.c

    r13479 r14590  
    33int zplot (int argc, char **argv) {
    44 
    5   int i, kapa, N, Npts;
     5  int i, kapa, Npts;
    66  float *in, *out;
    77  double min, range;

  • trunk/Ohana/src/opihi/dimm/Telescope.c

    r7917 r14590  
    3737  if (!status) return (FALSE);
    3838
    39   status = str_to_radec (r, d, rastr, decstr);
     39  status = ohana_str_to_radec (r, d, rastr, decstr);
    4040  if (!status) return (FALSE);
    4141
    … …  
    207207
    208208  SerialCommand (":GA#", &answer, SER_TIMEOUT);
    209   dms_to_ddd (x, answer);
     209  ohana_dms_to_ddd (x, answer);
    210210  free (answer);
    211211
    212212  SerialCommand (":GZ#", &answer, SER_TIMEOUT);
    213   dms_to_ddd (y, answer);
     213  ohana_dms_to_ddd (y, answer);
    214214  free (answer);
    215215
    … …  
    312312  /* : get latitude */
    313313  SerialCommand (":Gt#", &answer, SER_TIMEOUT);
    314   dms_to_ddd (lat, answer);
     314  ohana_dms_to_ddd (lat, answer);
    315315  free (answer);
    316316
    317317  /* : get longitude */
    318318  SerialCommand (":Gg#", &answer, SER_TIMEOUT);
    319   dms_to_ddd (lon, answer);
     319  ohana_dms_to_ddd (lon, answer);
    320320  free (answer);
    321321
    322322  /* : get LST */
    323323  SerialCommand (":GS#", &answer, SER_TIMEOUT);
    324   dms_to_ddd (lst, answer);
     324  ohana_dms_to_ddd (lst, answer);
    325325  free (answer);
    326326

  • trunk/Ohana/src/opihi/dvo/ImageOps.c

    r14401 r14590  
    2727
    2828  if (selection->useSkyregion) {
    29     get_skyregion (&patch.Rmin, &patch.Rmax, &patch.Dmin, &patch.Dmax);
     29    double Rs, Re, Ds, De;
     30    get_skyregion (&Rs, &Re, &Ds, &De);
     31    patch.Rmin = Rs;
     32    patch.Rmax = Re;
     33    patch.Dmin = Ds;
     34    patch.Dmax = De;
    3035    Rmin = patch.Rmin - 182.0;
    3136    Rmax = patch.Rmax + 182.0;

  • trunk/Ohana/src/opihi/dvo/ImageSelection.c

    r14401 r14590  
    1111int SetImageSelection (int mosaicMode, SkyRegionSelection *selection) {
    1212
    13   int Ngraph;
    1413  int TimeSelect;
    1514  time_t tzero, tend;

  • trunk/Ohana/src/opihi/dvo/avextract.c

    r14401 r14590  
    55  int i, j, n, m, N, Npts, NPTS, last, Nfields, Nreturn, Ncstack, Nstack;
    66  int Nsecfilt, mode, VERBOSE;
    7   char *p;
    87  char **cstack, name[1024];
    98  float *values;
    … …  
    135134  return (TRUE);
    136135
    137  usage:
    138   gprint (GP_ERR, "USAGE: avextract (value) [options]\n");
    139   gprint (GP_ERR, "  value: average.parameter or photcode\n");
    140 
    141136 escape:
    142137  dbFreeFields (fields, Nfields);

  • trunk/Ohana/src/opihi/dvo/calextract.c

    r14401 r14590  
    55int calextract (int argc, char **argv) {
    66 
    7   int i, j, m, N, Nr, mode[2];
     7  int i, N, Nr, mode[2];
    88  int Nsecfilt, NSTAR;
    9   double M1, M2, dM2, color;
    109
    1110  PhotCode *code[2];

  • trunk/Ohana/src/opihi/dvo/calmextract.c

    r14401 r14590  
    66int calmextract (int argc, char **argv) {
    77 
    8   int i, j, k, m, N, N1, Nr, mode[2];
     8  int i, k, N, Nr, mode[2];
    99  int NSTAR, Nstar, Nsecfilt;
    10   double *M1, M2, dM2, color;
    1110
    1211  Catalog catalog;

  • trunk/Ohana/src/opihi/dvo/dbCmdlineFields.c

    r14401 r14590  
    44dbField *dbCmdlineFields (int argc, char **argv, int table, int *last, int *nfields) {
    55
    6   int i, j, status, Nfields, NFIELDS;
     6  int i, status, Nfields, NFIELDS;
    77  char *p, *q, *field;
    88  dbField *fields;

  • trunk/Ohana/src/opihi/dvo/dbExtractMeasures.c

    r14401 r14590  
    1212double dbExtractMeasures (Average *average, SecFilt *secfilt, Measure *measure, dbField *field) {
    1313
    14   int i, Nsec;
     14  int Nsec;
    1515  double value;
    1616  double ra, dec, x, y;
    … …  
    116116      value = average[0].Nn;
    117117      break;
    118     case MEAS_NPHOT: /* OK */
    119       Nsec = f(measure[0].photcode);
    120       value = secfilt[Nsec].Nused;
    121       break;
    122     case MEAS_NCODE: /* OK */
    123       Nsec = f(measure[0].photcode);
    124       value = secfilt[Nsec].Ncode;
    125       break;
    126118    case MEAS_OBJFLAGS: /* OK */
    127119      value = average[0].code;
    128120      break;
    129 //    case MEAS_dMAG: /* OK */
    130 //      value = measure[0].dM;
    131 //      break;
    132121    // note that these represent the ra displacement relative to the average, not
    133122    // the error.

  • trunk/Ohana/src/opihi/dvo/dbFields.c

    r14401 r14590  
    122122  if (!strcasecmp (fieldName, "nmeas"))    ESCAPE (MEAS_NMEAS,          MAG_NONE);
    123123  if (!strcasecmp (fieldName, "nmiss"))    ESCAPE (MEAS_NMISS,          MAG_NONE);
    124   if (!strcasecmp (fieldName, "nphot"))    ESCAPE (MEAS_NPHOT,          MAG_NONE);
    125   if (!strcasecmp (fieldName, "ncode"))    ESCAPE (MEAS_NCODE,          MAG_NONE);
    126124  if (!strcasecmp (fieldName, "objflags")) ESCAPE (MEAS_OBJFLAGS,       MAG_NONE);
    127125  if (!strcasecmp (fieldName, "AIRMASS"))  ESCAPE (MEAS_AIRMASS,        MAG_NONE);

  • trunk/Ohana/src/opihi/dvo/detrend.c

    r7917 r14590  
    2727  if ((N = get_argument (argc, argv, "-time"))) {
    2828    remove_argument (N, &argc, argv);
    29     if (!str_to_time (argv[N], &tzero)) {
    30       gprint (GP_ERR, "syntax error\n");
    31       return (FALSE);
    32     }
    33     remove_argument (N, &argc, argv);
    34     if (!str_to_dtime (argv[N], &trange)) {
     29    if (!ohana_str_to_time (argv[N], &tzero)) {
     30      gprint (GP_ERR, "syntax error\n");
     31      return (FALSE);
     32    }
     33    remove_argument (N, &argc, argv);
     34    if (!ohana_str_to_dtime (argv[N], &trange)) {
    3535      gprint (GP_ERR, "syntax error\n");
    3636      return (FALSE);
    … …  
    4545  if ((N = get_argument (argc, argv, "-trange"))) {
    4646    remove_argument (N, &argc, argv);
    47     if (!str_to_time (argv[N], &tzero)) {
    48       gprint (GP_ERR, "syntax error\n");
    49       return (FALSE);
    50     }
    51     remove_argument (N, &argc, argv);
    52     if (!str_to_time (argv[N], &tend)) {
     47    if (!ohana_str_to_time (argv[N], &tzero)) {
     48      gprint (GP_ERR, "syntax error\n");
     49      return (FALSE);
     50    }
     51    remove_argument (N, &argc, argv);
     52    if (!ohana_str_to_time (argv[N], &tend)) {
    5353      gprint (GP_ERR, "syntax error\n");
    5454      return (FALSE);

  • trunk/Ohana/src/opihi/dvo/dmt.c

    r13479 r14590  
    44int dmt (int argc, char **argv) {
    55 
     6  // XXX this needs to be fixed: how to access different graphs at once?
     7  gprint (GP_ERR, "ERROR: this function is currently disabled\n");
     8  return (FALSE);
     9
     10# if (0)
     11
    612  int i, m, k, N, kapa, SaveVectors;
    713  int Nsec, Nsecfilt, NPTS;
    … …  
    3844  }
    3945
    40   // XXX this needs to be fixed: how to access different graphs at once?
    41   gprint (GP_ERR, "ERROR: this function is currently disabled\n");
    42   return (FALSE);
    4346  if (!GetGraphData (&graphsky, &kapa, NULL)) return (FALSE);
    4447  if (!GetGraph (&graphmode, NULL, NULL)) return (FALSE);
    … …  
    151154  }
    152155  return (TRUE);
    153 
     156# endif
    154157}

  • trunk/Ohana/src/opihi/dvo/gimages.c

    r14497 r14590  
    3030  if ((N = get_argument (argc, argv, "-time"))) {
    3131    remove_argument (N, &argc, argv);
    32     if (!str_to_time (argv[N], &tzero)) {
     32    if (!ohana_str_to_time (argv[N], &tzero)) {
    3333      gprint (GP_ERR, "syntax error\n");
    3434      return (FALSE);
    3535    }
    3636    remove_argument (N, &argc, argv);
    37     if (!str_to_dtime (argv[N], &trange)) {
     37    if (!ohana_str_to_dtime (argv[N], &trange)) {
    3838      gprint (GP_ERR, "syntax error\n");
    3939      return (FALSE);
    … …  
    5050    remove_argument (N, &argc, argv);
    5151
    52     if (!str_to_dtime (argv[N], &trange)) {
     52    if (!ohana_str_to_dtime (argv[N], &trange)) {
    5353      gprint (GP_ERR, "syntax error\n");
    5454      return (FALSE);
    … …  
    8080  }
    8181
    82   if (!str_to_radec (&Ra, &Dec, argv[1], argv[2])) return (FALSE);
     82  if (!ohana_str_to_radec (&Ra, &Dec, argv[1], argv[2])) return (FALSE);
    8383
    8484  if ((image = LoadImages (&Nimage)) == NULL) return (FALSE);
    … …  
    8989  int TriangleUp   = wordhash ("TRP-");
    9090  int TriangleDn   = wordhash ("TRM-");
    91   int TrianglePts  = wordhash ("TRI-");
    9291
    9392  Nfound = 0;
    … …  
    149148
    150149  got_spot:
    151     date = sec_to_date (image[i].tzero);
     150    date = ohana_sec_to_date (image[i].tzero);
    152151
    153152    if (PixelCoords) {

  • trunk/Ohana/src/opihi/dvo/gstar.c

    r12332 r14590  
    168168
    169169          if (GetMeasures && !QUIET) {
    170             date = sec_to_date (catalog.measure[m].t);
     170            date = ohana_sec_to_date (catalog.measure[m].t);
    171171            gprint (GP_LOG, "%6.3f %6.3f %5.3f  %20s  %5.2f %5.2f %2d %3x %3d %-20s\n",
    172172                     Mcat, Mrel, catalog.measure[m].dM,

  • trunk/Ohana/src/opihi/dvo/images.c

    r13479 r14590  
    6161  if ((N = get_argument (argc, argv, "-time"))) {
    6262    remove_argument (N, &argc, argv);
    63     if (!str_to_time (argv[N], &tzero)) {
    64       gprint (GP_ERR, "syntax error\n");
    65       return (FALSE);
    66     }
    67     remove_argument (N, &argc, argv);
    68     if (!str_to_dtime (argv[N], &trange)) {
     63    if (!ohana_str_to_time (argv[N], &tzero)) {
     64      gprint (GP_ERR, "syntax error\n");
     65      return (FALSE);
     66    }
     67    remove_argument (N, &argc, argv);
     68    if (!ohana_str_to_dtime (argv[N], &trange)) {
    6969      gprint (GP_ERR, "syntax error\n");
    7070      return (FALSE);
    … …  
    7979  if ((N = get_argument (argc, argv, "-trange"))) {
    8080    remove_argument (N, &argc, argv);
    81     if (!str_to_time (argv[N], &tzero)) {
    82       gprint (GP_ERR, "syntax error\n");
    83       return (FALSE);
    84     }
    85     remove_argument (N, &argc, argv);
    86     if (!str_to_time (argv[N], &tend)) {
     81    if (!ohana_str_to_time (argv[N], &tzero)) {
     82      gprint (GP_ERR, "syntax error\n");
     83      return (FALSE);
     84    }
     85    remove_argument (N, &argc, argv);
     86    if (!ohana_str_to_time (argv[N], &tend)) {
    8787      gprint (GP_ERR, "syntax error\n");
    8888      return (FALSE);

  • trunk/Ohana/src/opihi/dvo/imdata.c

    r14401 r14590  
    2626  if ((N = get_argument (argc, argv, "-time"))) {
    2727    remove_argument (N, &argc, argv);
    28     if (!str_to_time (argv[N], &tzero)) {
     28    if (!ohana_str_to_time (argv[N], &tzero)) {
    2929      gprint (GP_ERR, "syntax error\n");
    3030      return (FALSE);
    3131    }
    3232    remove_argument (N, &argc, argv);
    33     if (!str_to_dtime (argv[N], &trange)) {
     33    if (!ohana_str_to_dtime (argv[N], &trange)) {
    3434      gprint (GP_ERR, "syntax error\n");
    3535      return (FALSE);

  • trunk/Ohana/src/opihi/dvo/imextract.c

    r14401 r14590  
    66 
    77  int i, j, Nimage, mode, N, PhotcodeSelect;
    8   int TimeSelect, RegionSelect, *subset, Nsubset, TimeFormat, FlagSelect, FlagValue;
     8  int TimeSelect, *subset, Nsubset, TimeFormat, FlagSelect, FlagValue;
    99  double x, y, ra, dec, t, trange;
    1010  time_t tzero, TimeReference;
    … …  
    2727  if ((N = get_argument (argc, argv, "-time"))) {
    2828    remove_argument (N, &argc, argv);
    29     if (!str_to_time (argv[N], &tzero)) {
     29    if (!ohana_str_to_time (argv[N], &tzero)) {
    3030      gprint (GP_ERR, "syntax error\n");
    3131      return (FALSE);
    3232    }
    3333    remove_argument (N, &argc, argv);
    34     if (!str_to_dtime (argv[N], &trange)) {
     34    if (!ohana_str_to_dtime (argv[N], &trange)) {
    3535      gprint (GP_ERR, "syntax error\n");
    3636      return (FALSE);

  • trunk/Ohana/src/opihi/dvo/imlist.c

    r14401 r14590  
    2121  if ((N = get_argument (argc, argv, "-time"))) {
    2222    remove_argument (N, &argc, argv);
    23     if (!str_to_time (argv[N], &tzero)) {
     23    if (!ohana_str_to_time (argv[N], &tzero)) {
    2424      gprint (GP_ERR, "syntax error\n");
    2525      return (FALSE);
    2626    }
    2727    remove_argument (N, &argc, argv);
    28     if (!str_to_dtime (argv[N], &trange)) {
     28    if (!ohana_str_to_dtime (argv[N], &trange)) {
    2929      gprint (GP_ERR, "syntax error\n");
    3030      return (FALSE);

  • trunk/Ohana/src/opihi/dvo/imphot.c

    r14401 r14590  
    4040
    4141  /* load image(s) in time range given */
    42   if (!str_to_time (argv[1], &tzero)) {
     42  if (!ohana_str_to_time (argv[1], &tzero)) {
    4343    gprint (GP_ERR, "syntax error\n");
    4444    return (FALSE);
    4545  }
    46   if (!str_to_dtime (argv[2], &trange)) {
     46  if (!ohana_str_to_dtime (argv[2], &trange)) {
    4747    gprint (GP_ERR, "syntax error\n");
    4848    return (FALSE);

  • trunk/Ohana/src/opihi/dvo/imrough.c

    r7917 r14590  
    2323  if ((N = get_argument (argc, argv, "-time"))) {
    2424    remove_argument (N, &argc, argv);
    25     if (!str_to_time (argv[N], &tzero)) {
     25    if (!ohana_str_to_time (argv[N], &tzero)) {
    2626      gprint (GP_ERR, "syntax error\n");
    2727      return (FALSE);
    2828    }
    2929    remove_argument (N, &argc, argv);
    30     if (!str_to_dtime (argv[N], &trange)) {
     30    if (!ohana_str_to_dtime (argv[N], &trange)) {
    3131      gprint (GP_ERR, "syntax error\n");
    3232      return (FALSE);
    … …  
    4141  if ((N = get_argument (argc, argv, "-trange"))) {
    4242    remove_argument (N, &argc, argv);
    43     if (!str_to_time (argv[N], &tzero)) {
     43    if (!ohana_str_to_time (argv[N], &tzero)) {
    4444      gprint (GP_ERR, "syntax error\n");
    4545      return (FALSE);
    4646    }
    4747    remove_argument (N, &argc, argv);
    48     if (!str_to_time (argv[N], &tend)) {
     48    if (!ohana_str_to_time (argv[N], &tend)) {
    4949      gprint (GP_ERR, "syntax error\n");
    5050      return (FALSE);

  • trunk/Ohana/src/opihi/dvo/imsearch.c

    r12332 r14590  
    2525  if ((N = get_argument (argc, argv, "-time"))) {
    2626    remove_argument (N, &argc, argv);
    27     if (!str_to_time (argv[N], &tzero)) {
     27    if (!ohana_str_to_time (argv[N], &tzero)) {
    2828      gprint (GP_ERR, "syntax error\n");
    2929      return (FALSE);
    3030    }
    3131    remove_argument (N, &argc, argv);
    32     if (!str_to_dtime (argv[N], &trange)) {
     32    if (!ohana_str_to_dtime (argv[N], &trange)) {
    3333      gprint (GP_ERR, "syntax error\n");
    3434      return (FALSE);

  • trunk/Ohana/src/opihi/dvo/mextract.c

    r14401 r14590  
    33int mextract (int argc, char **argv) {
    44 
    5   int i, j, k, m, n, N, N1, Npts, NPTS, last, Nfields, Nreturn, Ncstack, Nstack;
     5  int i, j, k, m, n, N, Npts, NPTS, last, Nfields, Nreturn, Ncstack, Nstack;
    66  int Nsecfilt, VERBOSE, loadImages, mosaicMode;
    7   char *p;
    8   double *M1;
    97  char **cstack, name[1024];
    108  float *values;
    … …  
    2422  fields = NULL;
    2523  stack = NULL;
     24
     25  if ((N = get_argument (argc, argv, "-h"))) goto help;
     26  if ((N = get_argument (argc, argv, "--help"))) goto help;
    2627
    2728  VERBOSE = FALSE;
    … …  
    159160  FreeSkyRegionSelection (selection);
    160161  return (TRUE);
    161 
    162 usage:
    163   gprint (GP_ERR, "USAGE: mextract (value) [options]\n");
    164   gprint (GP_ERR, "  value: measure.parameter or photcode\n");
    165   return (FALSE);
    166162
    167163escape:

  • trunk/Ohana/src/opihi/dvo/photometry.c

    r14401 r14590  
    443443  if ((N = get_argument (*argc, argv, "-time"))) {
    444444    remove_argument (N, argc, argv);
    445     if (!str_to_time (argv[N], &tzero)) {
     445    if (!ohana_str_to_time (argv[N], &tzero)) {
    446446      gprint (GP_ERR, "syntax error\n");
    447447      return (FALSE);
    448448    }
    449449    remove_argument (N, argc, argv);
    450     if (!str_to_dtime (argv[N], &trange)) {
     450    if (!ohana_str_to_dtime (argv[N], &trange)) {
    451451      gprint (GP_ERR, "syntax error\n");
    452452      return (FALSE);

  • trunk/Ohana/src/opihi/dvo/pmeasure.c

    r13505 r14590  
    127127        if ((R < Rmin) || (R > Rmax) || (D < -90.0) || (D > 90.0)) {
    128128          char *date;
    129           date = sec_to_date (catalog.measure[m+k].t);
     129          date = ohana_sec_to_date (catalog.measure[m+k].t);
    130130          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);
    131131          free (date);

  • trunk/Ohana/src/opihi/dvo/skycoverage.c

    r9275 r14590  
    2424  if ((N = get_argument (argc, argv, "-time"))) {
    2525    remove_argument (N, &argc, argv);
    26     if (!str_to_time (argv[N], &tzero)) {
     26    if (!ohana_str_to_time (argv[N], &tzero)) {
    2727      gprint (GP_ERR, "syntax error\n");
    2828      return (FALSE);
    2929    }
    3030    remove_argument (N, &argc, argv);
    31     if (!str_to_dtime (argv[N], &trange)) {
     31    if (!ohana_str_to_dtime (argv[N], &trange)) {
    3232      gprint (GP_ERR, "syntax error\n");
    3333      return (FALSE);
    … …  
    4242  if ((N = get_argument (argc, argv, "-trange"))) {
    4343    remove_argument (N, &argc, argv);
    44     if (!str_to_time (argv[N], &tzero)) {
     44    if (!ohana_str_to_time (argv[N], &tzero)) {
    4545      gprint (GP_ERR, "syntax error\n");
    4646      return (FALSE);
    4747    }
    4848    remove_argument (N, &argc, argv);
    49     if (!str_to_time (argv[N], &tend)) {
     49    if (!ohana_str_to_time (argv[N], &tend)) {
    5050      gprint (GP_ERR, "syntax error\n");
    5151      return (FALSE);

  • trunk/Ohana/src/opihi/dvo/subpix.c

    r14401 r14590  
    2828    return (FALSE);
    2929  }
    30   if (!str_to_radec (&Ra, &Dec, argv[1], argv[2])) return (FALSE);
     30  if (!ohana_str_to_radec (&Ra, &Dec, argv[1], argv[2])) return (FALSE);
    3131  if (Ra < 0) Ra += 360.0;
    3232  if (Ra > 360.0) Ra -= 360.0;

  • trunk/Ohana/src/opihi/include/convert.h

    r8192 r14590  
    1515int           day_to_sec            PROTO((char *string, time_t *second));
    1616int           hms_to_sec            PROTO((char *string, time_t *second));
    17 char         *sec_to_hms            PROTO((time_t second));
    18 char         *sec_to_day            PROTO((time_t second));
     17char         *ohana_sec_to_hms      PROTO((time_t second));
     18char         *ohana_sec_to_day      PROTO((time_t second));
    1919
    2020char         *meade_deg_to_str      PROTO((double deg));

  • trunk/Ohana/src/opihi/include/dvoshell.h

    r14401 r14590  
    4242      MEAS_NMEAS,
    4343      MEAS_NMISS,
    44       MEAS_NPHOT,
    45       MEAS_NCODE,
    4644      MEAS_OBJFLAGS,
    4745      MEAS_MAG,
    … …  
    170168Image        *LoadImages            PROTO((int *Nimage));
    171169Image        *MatchImage            PROTO((unsigned int time, short int source));
    172 Image        *MatchImage            PROTO((unsigned int time, short int source));
    173170Coords       *MatchMosaic           PROTO((unsigned int time, short int source));
    174171int           Quality               PROTO((Measure *measure, int IsDophot));
    … …  
    227224char        *strfloat               PROTO((float value));
    228225
     226int get_skyregion (double *Rs, double *Re, double *Ds, double *De);
     227int set_skyregion (double Rs, double Re, double Ds, double De);
     228void FreeImageSelection ();
     229
     230void FreeSkyRegionSelection (SkyRegionSelection *selection);
     231int wordhash (char *word);
     232
    229233# endif

  • trunk/Ohana/src/opihi/include/imfit.h

    r4689 r14590  
    1414void sgauss_setup (char *name);
    1515void qgauss_setup (char *name);
    16 void Pgauss_setup (char *name);
    17 void Sgauss_setup (char *name);
    18 void Qgauss_setup (char *name);
    1916void qfgauss_setup (char *name);
    2017void qrgauss_setup (char *name);
     18void pgauss_psf_setup (char *name);
     19void qgauss_psf_setup (char *name);
     20void sgauss_psf_setup (char *name);

  • trunk/Ohana/src/opihi/include/pcontrol.h

    r12840 r14590  
    216216void   LinkJobAndHost (Job *job, Host *host);
    217217
     218void pcontrol_exit (int n);
     219
    218220// Job   *FindJobByID (IDtype JobID, int *StackID);
    219221// Job   *FindJobInStackByID (int StackID, int ID);

  • trunk/Ohana/src/opihi/lib.data/convert.c

    r8192 r14590  
    117117
    118118/***** convert seconds to HH:MM:SS ****/
    119 char *sec_to_hms (time_t second) {
     119char *ohana_sec_to_hms (time_t second) {
    120120 
    121121  struct tm *gmt;
    … …  
    129129
    130130/***** convert seconds to Day@HH:MM:SS ****/
    131 char *sec_to_day (time_t second) {
     131char *ohana_sec_to_day (time_t second) {
    132132 
    133133  struct tm *gmt;

  • trunk/Ohana/src/opihi/lib.data/open_kapa.c

    r14283 r14590  
    190190  }
    191191  KapaSetGraphData (Socket[Active], data);
     192  return (TRUE);
    192193}
    193194
    … …  
    254255  }
    255256  KapaSetImageData (Socket[Active], data);
     257  return (TRUE);
    256258}
    257259

  • trunk/Ohana/src/opihi/lib.shell/timeformat.c

    r7917 r14590  
    77  *TimeReference = 0;
    88  if ((p = get_variable ("TIMEREF")) != (char *) NULL) {
    9     if (!str_to_time (p, TimeReference)) {
     9    if (!ohana_str_to_time (p, TimeReference)) {
    1010      gprint (GP_ERR, "error in TIME_REF format\n");
    1111      return (FALSE);

  • trunk/Ohana/src/opihi/pantasks/CheckController.c

    r12404 r14590  
    8989  if (VerboseMode()) gprint (GP_ERR, "clear %d crash jobs %f\n", i, TimerElapsed(TRUE));
    9090
    91  finish:
    9291  FlushIOBuffer (&buffer);
    9392  // status = ControllerCommand ("run", CONTROLLER_PROMPT, &buffer);

  • trunk/Ohana/src/opihi/pantasks/TaskOps.c

    r12332 r14590  
    104104        switch (tasks[i][0].ranges[j].type) {
    105105          case RANGE_ABS:
    106             start = sec_to_date (tasks[i][0].ranges[j].start);
    107             stop  = sec_to_date (tasks[i][0].ranges[j].stop);
     106            start = ohana_sec_to_date (tasks[i][0].ranges[j].start);
     107            stop  = ohana_sec_to_date (tasks[i][0].ranges[j].stop);
    108108            break;
    109109          case RANGE_DAY:
    110             start = sec_to_hms (tasks[i][0].ranges[j].start);
    111             stop  = sec_to_hms (tasks[i][0].ranges[j].stop);
     110            start = ohana_sec_to_hms (tasks[i][0].ranges[j].start);
     111            stop  = ohana_sec_to_hms (tasks[i][0].ranges[j].stop);
    112112            break;
    113113          case RANGE_WEEK:
    114             start = sec_to_day (tasks[i][0].ranges[j].start);
    115             stop  = sec_to_day (tasks[i][0].ranges[j].stop);
     114            start = ohana_sec_to_day (tasks[i][0].ranges[j].start);
     115            stop  = ohana_sec_to_day (tasks[i][0].ranges[j].stop);
    116116            break;
    117117          default:
    … …  
    264264    switch (tasks[i][0].ranges[j].type) {
    265265      case RANGE_ABS:
    266         start = sec_to_date (tasks[i][0].ranges[j].start);
    267         stop  = sec_to_date (tasks[i][0].ranges[j].stop);
     266        start = ohana_sec_to_date (tasks[i][0].ranges[j].start);
     267        stop  = ohana_sec_to_date (tasks[i][0].ranges[j].stop);
    268268        break;
    269269      case RANGE_DAY:
    270         start = sec_to_hms (tasks[i][0].ranges[j].start);
    271         stop  = sec_to_hms (tasks[i][0].ranges[j].stop);
     270        start = ohana_sec_to_hms (tasks[i][0].ranges[j].start);
     271        stop  = ohana_sec_to_hms (tasks[i][0].ranges[j].stop);
    272272        break;
    273273      case RANGE_WEEK:
    274         start = sec_to_day (tasks[i][0].ranges[j].start);
    275         stop  = sec_to_day (tasks[i][0].ranges[j].stop);
     274        start = ohana_sec_to_day (tasks[i][0].ranges[j].start);
     275        stop  = ohana_sec_to_day (tasks[i][0].ranges[j].stop);
    276276        break;
    277277      default:

  • trunk/Ohana/src/opihi/pantasks/controller_jobstack.c

    r12467 r14590  
    2121
    2222  // XXX this has an error?  test this out...
    23   sprintf (command, "jobstack", argv[2]);
     23  sprintf (command, "jobstack %s", argv[2]);
    2424  InitIOBuffer (&buffer, 0x100);
    2525

  • trunk/Ohana/src/opihi/pantasks/flush.c

    r13548 r14590  
    22
    33int flush_jobs (int argc, char **argv) {
    4 
    5   Job *job;
    6   int JobID;
    74
    85  if (argc != 2) goto usage;

  • trunk/Ohana/src/opihi/pantasks/task.c

    r12469 r14590  
    44int task (int argc, char **argv) {
    55
    6   int N, hash;
     6  int hash;
    77  int ThisList, status;
    88  char *input, *outline;

  • trunk/Ohana/src/opihi/pantasks/task_trange.c

    r8192 r14590  
    6969  /* this test does not fail sufficiently robustly for invalid inputs */
    7070  /* test for YYYY/MM/DD - both must match */
    71   if (str_to_time (argv[1], &range.start)) {
    72     if (!str_to_time (argv[2], &range.stop)) {
     71  if (ohana_str_to_time (argv[1], &range.start)) {
     72    if (!ohana_str_to_time (argv[2], &range.stop)) {
    7373      gprint (GP_ERR, "invalid date/time %s\n", argv[2]);
    7474      goto usage;

  • trunk/Ohana/src/opihi/pcontrol/HostOps.c

    r13720 r14590  
    2525  gprint (GP_ERR, "error: unknown host stack : programming error\n");
    2626  pcontrol_exit (1);
     27  return (NULL);
    2728}
    2829
    … …  
    3738  gprint (GP_ERR, "error: unknown host stack : programming error\n");
    3839  pcontrol_exit (1);
     40  return (NULL);
    3941}
    4042

  • trunk/Ohana/src/opihi/pcontrol/JobOps.c

    r13720 r14590  
    2828  gprint (GP_ERR, "error: unknown host stack : programming error\n");
    2929  pcontrol_exit (1);
     30  return (NULL);
    3031}
    3132
    … …  
    4142  gprint (GP_ERR, "error: unknown job stack : programming error\n");
    4243  pcontrol_exit (1);
     44  return (NULL);
    4345}
    4446

  • trunk/Ohana/src/opihi/pcontrol/ResetJob.c

    r13720 r14590  
    4848  gprint (GP_ERR, "programming error in GetJobOutput (should not reach here)\n");
    4949  pcontrol_exit (1);
     50  return (FALSE);
    5051}
    5152
Note: See TracChangeset for help on using the changeset viewer.