IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 4689


Ignore:
Timestamp:
Jul 31, 2005, 1:04:22 PM (21 years ago)
Author:
eugene
Message:

cleanups so -Wall -Werror succeed, some .h reorgs

Location:
trunk/Ohana/src/opihi
Files:
2 added
2 deleted
159 edited

Legend:

Unmodified
Added
Removed

  • trunk/Ohana/src/opihi/Makefile

    r3525 r4689  
    1818PROGRAM = mana dvo
    1919
    20 EXTRAS = dvo2 sched dimm pclient pcontrol
     20EXTRAS = sched pclient pcontrol
     21
     22SKIP =  dimm
    2123
    2224all:
    … …  
    2931        for i in $(PROGRAM); do make $$i.install || exit; done
    3032
     33extra-install:
     34        for i in $(EXTRAS); do make $$i.install || exit; done
     35
    3136clean:
    32         for i in $(PROGRAM) $(LIBS); do make $$i.clean || exit; done
     37        for i in $(PROGRAM) $(EXTRAS) $(LIBS); do make $$i.clean || exit; done
     38
     39dist: clean
     40        rm -f bin/*.*
     41        rm -f lib/*.a
    3342
    3443#############################################################

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

    r2843 r4689  
    99  Buffer *buf;
    1010
     11  xvec = yvec = NULL;
    1112  NoVector = TRUE;
    1213  if ((N = get_argument (argc, argv, "-v"))) {

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

    r3404 r4689  
    175175  double N, r, d;
    176176
     177  Xin = Yin = 0;
    177178  N = x = y = x2 = y2 = xy = X = Y = Xx = Xy = Yx = Yy = 0;
    178179

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

    r2598 r4689  
    33int getvel (int argc, char **argv) {
    44 
    5   int i, X, n, Ncurve;
     5  int i, n, Ncurve;
    66  int nx, ny;
    77  double L, V, Vo, dV, Bo, dB;
    … …  
    4545  while (L >= 360) {L -= 360.0;}
    4646  while (L < 0.0)  {L += 360.0;}
    47   fprintf (stderr, "L: %f (%d)\n", L, X);
     47  fprintf (stderr, "L: %f\n", L);
    4848
    4949  cl = cos (L*RAD_DEG);

  • trunk/Ohana/src/opihi/cmd.astro/imfit-Sgauss.c

    r3144 r4689  
    4646
    4747  float X, Y, px1, py1, px2, py2;
    48   float z1, z2, r, q1, q2, f, f1, f2;
     48  float z1, z2, r, q1, q2, f;
    4949
    5050  X = x - par[0];

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

    r3144 r4689  
    66  int sx, sy, nx, ny, Nx, Ny;
    77  float chisq, ochisq, dchisq, Gain, RDnoise, SatThreshold;
    8   float *x, *y, *z, *dz, *V, *parmin, *parmax;
    9   char line[64];
     8  float *x, *y, *z, *dz, *V;
    109  Buffer *buf;
    1110
    … …  
    123122  ochisq = mrq2dinit (x, y, z, dz, Npts, par, Npar, fitfunc, VERBOSE);
    124123  dchisq = ochisq;
     124  chisq  = ochisq;
    125125  for (i = 0; (i < 25) && ((dchisq <= 0.0) || (dchisq > 0.01*(Npts - Npar))); i++) {
    126126    chisq = mrq2dmin (x, y, z, dz, Npts, par, Npar, fitfunc, VERBOSE);

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

    r2843 r4689  
    1111  Buffer *in, *out;
    1212
     13  IgnoreValue = 0;
    1314  Ignore = FALSE;
    1415  if ((N = get_argument (argc, argv, "-ignore"))) {

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

    r3692 r4689  
    33int region (int argc, char **argv) {
    44 
    5   char buffer[65], buffer2[35], string[256];
     5  char buffer[65], string[256];
    66  double Ra, Dec, Radius;
    77  double dx, dy;
    8   int status, N;
     8  int N, Ngraph, Xgraph;
    99  Graphdata graphmode;
    10   int Ngraph, Xgraph;
    1110
    1211  Ngraph = 0;

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

    r2843 r4689  
    9191    }
    9292    fsort (buffer, Nring);
    93     for (Npts = sky = 0, i = 0.25*Nring; i < 0.75*Nring; i++, Npts += 1.0) {
     93    for (Npts = sky = sky2 = 0, i = 0.25*Nring; i < 0.75*Nring; i++, Npts += 1.0) {
    9494      sky += buffer[i];
    9595      sky2 += buffer[i]*buffer[i];

  • trunk/Ohana/src/opihi/cmd.basic/init.c

    r4686 r4689  
    3030int strlen_func     PROTO((int, char **));
    3131int substr_func     PROTO((int, char **));
    32 int wait            PROTO((int, char **));
     32int wait_func       PROTO((int, char **));
    3333int version         PROTO((int, char **));
    3434int which           PROTO((int, char **));
    … …  
    6868  {"substr",        substr_func,        "substring"},
    6969  {"version",       version,            "list version information"},
    70   {"wait",          wait,               "wait until return is typed"},
     70  {"wait",          wait_func,          "wait until return is typed"},
    7171  {"which",         which,              "show command *"}
    7272};

  • trunk/Ohana/src/opihi/cmd.basic/list.c

    r2843 r4689  
    1212  FILE *f;
    1313
     14  Cmd = NULL;
    1415  RunCommand = FALSE;
    1516  if ((N = get_argument (argc, argv, "-x"))) {

  • trunk/Ohana/src/opihi/cmd.basic/macro.c

    r4470 r4689  
    2525  for (i = 0; i < N; i++) {
    2626    if (!strcmp (in_macro[i].name, argv[1])) {
    27       (*in_macro[i].func) (argc - 1, argv + 1);
     27      status = (*in_macro[i].func) (argc - 1, argv + 1);
    2828      return (status);
    2929    }

  • trunk/Ohana/src/opihi/cmd.basic/run_if.c

    r4462 r4689  
    66  int ThisList, depth, done, status, BreakOnTrue;
    77  int logic;
    8   char *input, *outline, *val;
     8  char *input, *val;
    99  int nloop, size;
    1010

  • trunk/Ohana/src/opihi/cmd.basic/wait.c

    r2598 r4689  
    11# include "basic.h"
    22
    3 int wait (int argc, char **argv) {
     3int wait_func (int argc, char **argv) {
    44
    55  char buff[1024];

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

    r3898 r4689  
    88  Vector *val, *key, *out;
    99
     10  NV = NULL;
    1011  Normalize = FALSE;
    1112  if ((N = get_argument (argc, argv, "-norm"))) {

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

    r3692 r4689  
    44 
    55  int i, N, Ngraph, Xgraph;
    6   char buffer[65], buffer2[65];
     6  char Ticks[16], Axis[16], Labels[16];
    77  Graphdata graphmode;
    8   char Ticks[16], Axis[16], Labels[16];
    98 
    109  strcpy (Ticks, "2222");

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

    r3693 r4689  
    55  double x, y;
    66  int zoom;
    7   char buffer[512], buffer2[20];
    87  int Ximage, Nimage, N;
    98 

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

    r2843 r4689  
    77  float *in;
    88  Buffer *buf;
     9
     10  inf_val = nan_val = min = Vmin = max = Vmax = 0;
    911
    1012  DO_NAN = FALSE;

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

    r3105 r4689  
    33int dot (int argc, char **argv) {
    44 
    5   int N, Npts, Ngraph;
     5  int N, Ngraph;
    66  Graphdata graphmode;
    77  float x, y;

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

    r3693 r4689  
    44 
    55  int i, n, N;
    6   char buffer[128];
    76  int Ximage, Nimage;
    87 

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

    r2598 r4689  
    1212  }
    1313
     14  Iim = NULL;
    1415  ZeroImaginary = TRUE;
    15   if ((Ire = SelectVector (argv[1], OLDVECTOR, TRUE)) == NULL) return (FALSE);
    1616  if (strcmp (argv[2], "0")) {
    1717    ZeroImaginary = FALSE;
    1818    if ((Iim = SelectVector (argv[2], OLDVECTOR, TRUE)) == NULL) return (FALSE);
    1919  }   
     20  if ((Ire = SelectVector (argv[1], OLDVECTOR, TRUE)) == NULL) return (FALSE);
    2021  if ((Ore = SelectVector (argv[4], ANYVECTOR, TRUE)) == NULL) return (FALSE);
    2122  if ((Oim = SelectVector (argv[5], ANYVECTOR, TRUE)) == NULL) return (FALSE);

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

    r2843 r4689  
    2020
    2121  /* select input / output buffers */
    22   if ((Ire = SelectBuffer (argv[1], OLDBUFFER, TRUE)) == NULL) return (FALSE);
     22  Iim = NULL;
    2323  ZeroImaginary = TRUE; /* Input(imaginary) may be 0, in which case we create a 0 filled image */
    2424  if (!strcmp (argv[2], "0")) {
    … …  
    2727    if ((Iim = SelectBuffer (argv[2], OLDBUFFER, TRUE)) == NULL) return (FALSE);
    2828  }   
     29  if ((Ire = SelectBuffer (argv[1], OLDBUFFER, TRUE)) == NULL) return (FALSE);
    2930  if ((Ore = SelectBuffer (argv[4], ANYBUFFER, TRUE)) == NULL) return (FALSE);
    3031  if ((Oim = SelectBuffer (argv[5], ANYBUFFER, TRUE)) == NULL) return (FALSE);

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

    r3896 r4689  
    3131  }
    3232
     33  dy = NULL;
     34  dyvec = NULL;
    3335  Weight = FALSE;
    3436  if ((N = get_argument (argc, argv, "-dy"))) {
    … …  
    7274    ALLOCATE (b[i], double, 1);
    7375  }
     76
     77  Nmask = 0;
     78  sigma = 0.0;
    7479
    7580  for (N = 0; N < ClipNiter; N++) {

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

    r3897 r4689  
    3737  }
    3838
     39  dz = NULL;
     40  dzvec = NULL;
    3941  Weight = FALSE;
    4042  if ((N = get_argument (argc, argv, "-dz"))) {
    … …  
    227229      }
    228230    }
    229     if (VERBOSE) fprintf (stderr, "pass: %d, Nmask: %d\n", N, Nmask, ClipNSigma);
     231    if (VERBOSE) fprintf (stderr, "pass: %d, Nmask: %d\n", N, Nmask);
    230232  }
    231233

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

    r3693 r4689  
    5858  SendGraphCommand (Ximage, 16, "OVER %9d ", n);
    5959 
     60  dx = dy = 0;
    6061  for (n = 0; scan_line (f, line) != EOF;) {
    6162    c = strchr (line, '#');
    … …  
    8788      ddec = dra;
    8889    case 5:
     90      x = ra;
     91      y = dec;
     92      dx = dra;
     93      dy = ddec;
    8994      if (ISCEL) {
    9095        if (!strcmp (type, "LINE")) {
    … …  
    106111          dx = (fabs(x1 - x) + fabs(y1 - y));
    107112        }
    108       }
    109       else {
    110         x = ra;
    111         y = dec;
    112         dx = dra;
    113         dy = ddec;
    114113      }
    115114    }

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

    r2598 r4689  
    2323
    2424  imax = -1;
    25   for (i = 0; i < vecx[0].Nelements-1; i++, X++, Y++) {
     25  xmax = *X;
     26  ymax = *Y;
     27  for (i = 1; i < vecx[0].Nelements-1; i++, X++, Y++) {
    2628    if ((*X >= start) && (*X <= end)) {
    2729      if ((imax == -1) || (*Y > ymax)) {

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

    r3693 r4689  
    77  double x, y, dx, dy, x1, y1;
    88  double dra, ddec, ra1, dec1, ra, dec;
    9   char *line;
    109  Coords coords;
    1110  Buffer *buf;

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

    r2843 r4689  
    1212
    1313  Ignore = FALSE;
     14  IgnoreValue = 0;
    1415  if ((N = get_argument (argc, argv, "-ignore"))) {
    1516    Ignore = TRUE;

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

    r3392 r4689  
    6868  strcpy (buf[0].file, filename);
    6969  free (filename);
     70
     71  status = FALSE;
    7072
    7173  if (extend) {

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

    r2843 r4689  
    1010  Buffer *in, *out;
    1111
     12  Vn = Npix = NULL;
    1213  Normalize = FALSE;
    1314  if ((N = get_argument (argc, argv, "-norm"))) {

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

    r3693 r4689  
    44 
    55  int N, n, ISCEL;
    6   char buffer[512], buffer2[512];
    76  int Ximage, Nimage;
    87 

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

    r3692 r4689  
    44 
    55  int N, List;
    6   char buffer[65], buffer2[65];
     6  int Ngraph, Xgraph;
    77  Graphdata graphmode;
    8   int Ngraph, Xgraph;
    98
    109  List = FALSE;

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

    r3899 r4689  
    1616  ALLOCATE (vec, Vector *, Nvec);
    1717
     18  Nval = 0;
    1819  /* find vectors and check sizes */
    1920  for (i = 0; i < Nvec; i++) {

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

    r2843 r4689  
    1010  Buffer *buf;
    1111
     12  IgnoreValue = 0;
    1213  Ignore = FALSE;
    1314  if ((N = get_argument (argc, argv, "-ignore"))) {
    … …  
    6465  /* calculate mode, median */
    6566  median = mode = 0.5*(max + min);
    66   if (range != 0) {
     67  if ((max - min) != 0) {
    6768    range = 0xffff / (max - min);
    6869    ALLOCATE (hist, int, 0x10000);

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

    r3692 r4689  
    44
    55  int N, size, FracPositions;
    6   char name[64], buffer[128];
     6  char name[64];
    77  double x, y, angle;
    88  int Ngraph, Xgraph;

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

    r3693 r4689  
    33int tv (int argc, char **argv) {
    44 
    5   int N, j, status, Npix, Ncolors, size, ISLOG, NNcol;
    6   char buffer[1024], buffer2[100];
     5  int N, j, Npix, Ncolors, size, ISLOG, NNcol;
     6  char buffer[1024];
    77  double a1, a2, max, min, zero, range;
    88  float *in;

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

    r3693 r4689  
    6969  float *v00, *v01, *v10, *v11;
    7070  float *Vout, *Vin, *matrix;
    71   char *buffer, line[17];
     71  char *buffer;
    7272  int Ximage, Nimage, N;
    7373  Buffer *buf;

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

    r3693 r4689  
    99  double x0, y0, x1, y1;
    1010  double dDEC, fDEC, dRA, fRA;
    11   char buffer[1024], format[16];
     11  char format[16];
    1212  Coords coords;
    1313  int Ximage, Nimage, N;
    … …  
    8383  NY = buf[0].header.Naxis[1];
    8484
     85  x0 = y0 = 0;
    8586  dRA = MAX (fabs(ra1 - ra0) / 100.0, 0.1);
    8687  connect = FALSE;

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

    r2843 r4689  
    1111  Buffer *in, *out;
    1212
     13  Npix = NULL;
     14  Vn = NULL;
    1315  Normalize = FALSE;
    1416  if ((N = get_argument (argc, argv, "-norm"))) {

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

    r2843 r4689  
    77  float *in;
    88  Vector *vec;
     9
     10  inf_val = nan_val = min = Vmin = max = Vmax = 0;
    911
    1012  DO_NAN = FALSE;

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

    r2843 r4689  
    1212  Vector *vec;
    1313
     14  IgnoreValue = 0;
    1415  Ignore = FALSE;
    1516  if ((N = get_argument (argc, argv, "-ignore"))) {

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

    r2843 r4689  
    1717  }
    1818
    19   newZero  = FALSE;
     19  outZero = 0;
     20  newZero = FALSE;
    2021  if ((N = get_argument (argc, argv, "-bzero"))) {
    2122    remove_argument (N, &argc, argv);
    … …  
    2526  }
    2627
     28  outScale = 1;
    2729  newScale = FALSE;
    2830  if ((N = get_argument (argc, argv, "-bscale"))) {
    … …  
    3335  }
    3436
     37  outBitpix = 16;
    3538  newBitpix = FALSE;
    3639  if ((N = get_argument (argc, argv, "-bitpix"))) {
    … …  
    4144  }
    4245
     46  outUnsign = FALSE;
    4347  newUnsign = FALSE;
    4448  if ((N = get_argument (argc, argv, "-unsign"))) {

  • trunk/Ohana/src/opihi/dimm/Makefile

    r3525 r4689  
    77LIB     =       $(HOME)/lib
    88INC     =       $(HOME)/include
    9 HELP    =       $(HOME)/help
    109SDIR    =       $(HOME)/dimm
    1110#
    … …  
    1413DESTINC =       $(LINC)
    1514DESTMAN =       $(LMAN)
     15DESTHLP =       $(LHLP)/dimm
    1616# 
    1717INCS    =       -I$(INC) -I$(LINC) -I$(XINC)
    … …  
    2020LIBS2   =       -lbasiccmd -ldatacmd -lastrocmd -lshell -ldata -lsbig
    2121LIBS    =       $(LIBS2) $(LIBS1)
    22 CFLAGS  =       $(INCS)
     22CFLAGS  =       $(INCS) -DHELPDIR_DEFAULT=$(DESTHLP)
    2323CCFLAGS =       $(LIBS)
    2424
    … …  
    6565$(BIN)/dimm.$(ARCH) : $(dimm) $(libs)
    6666
    67 install: $(DESTBIN)/dimm
     67install: $(DESTBIN)/dimm help
     68
     69help: cmd.basic.help cmd.data.help cmd.astro.help dimm.help
    6870
    6971# utilities #################################################
    … …  
    9597        cp $^ $@
    9698
     99clean:
     100        rm -f $(BIN)/*.$(ARCH)
     101        rm -f $(LIB)/*.$(ARCH).a
     102        rm -f `find . -name "*.o"`
     103        rm -f `find . -name "*~"`
     104        rm -f `find . -name "#*"`
     105
     106dist: clean
     107        rm -f $(BIN)/*
     108        rm -f $(LIB)/*
     109
    97110lib%.clean:
    98111        rm -f $(LIB)/lib$*.$(ARCH).a
    … …  
    107120        $(CC) $(CFLAGS) -c $*.c -o $@
    108121
    109 clean:
    110         rm -f $(BIN)/*.$(ARCH)
    111         rm -f $(LIB)/*.$(ARCH).a
    112         rm -f `find . -name "*.o"`
    113         rm -f `find . -name "*~"`
    114         rm -f `find . -name "#*"`
    115 
    116 dist: clean
    117         rm -f $(BIN)/*
    118         rm -f $(LIB)/*
     122%.help:
     123        @if [ ! -d $(DESTHLP) ]; then mkdir -p $(DESTHLP); fi
     124        rm -f $(HOME)/$*/help/*~
     125        rm -f $(HOME)/$*/help/#*
     126        cp $(HOME)/$*/help/* $(DESTHLP)/

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

    r2598 r4689  
    77# define opihi_rcfile ".dimmrc"
    88
    9 void InitBasic ();
    10 void InitData ();
    11 void InitAstro ();
    12 void InitDIMM ();
    13 
    14 void welcome () {
    15   fprintf (stderr, "\n");
    16   fprintf (stderr, "Welcome to %s - %s\n\n", opihi_name, opihi_description);
    17 }
    18 
    199/* program-dependent initialization */
    2010void initialize (int argc, char **argv) {
    2111 
    22   FILE *f;
    23 
    2412  auto_break = TRUE;
    2513
    … …  
    4230  InitBasic ();
    4331  InitData ();
     32  InitOutfile ();
    4433  InitAstro ();
    4534  InitDIMM ();
    46   InitOutfile ();
    4735
    4836  rl_readline_name = opihi_name;
    … …  
    5240  set_str_variable ("PROMPT", opihi_prompt);
    5341  set_str_variable ("RCFILE", opihi_rcfile);
     42# ifdef HELPDIR_DEFAULT
     43  set_str_variable ("HELPDIR", MACRO_NAME(HELPDIR_DEFAULT));
     44# endif
    5445
    55   /* here we open the history file for append.  it this fails, we
    56      won't be able to write to it, warn the user.  otherwise, this
    57      creates the file readline will write to, if it did not exist */ 
    58 
    59   /* check history file */
    60   /* rewrite with fstat or stat */
    61   f = fopen (opihi_history, "a");
    62   if (f == NULL) /* no current history file here */
    63     fprintf (stderr, "can't save history.\n");
    64   else
    65     fclose (f);
    66  
    67   stifle_history (200);
    68   read_history (opihi_history);
     46  { /* check history file permission */
     47    FILE *f;
     48    f = fopen (opihi_history, "a");
     49    if (f == NULL) /* no current history file here */
     50      fprintf (stderr, "can't save history.\n");
     51    else
     52      fclose (f);
     53    stifle_history (200);
     54    read_history (opihi_history);
     55  }
    6956
    7057  signal (SIGINT, SIG_IGN);
    … …  
    7259}
    7360
     61/* standard welcome message */
     62void welcome () {
     63  fprintf (stderr, "\n");
     64  fprintf (stderr, "Welcome to %s - %s\n\n", opihi_name, opihi_description);
     65}
     66
    7467/* add program-dependent exit functions here */
    7568void cleanup () {
    76   /* -libdisplay */
    7769  QuitImage ();
    7870  QuitGraph ();

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

    r4585 r4689  
    1111  double r, d, X, Y, x[4], y[4], Rmin, Rmax, Rmid;
    1212
     13  Rmin = Rmax = Rmid = 0;
    1314  if (RegionSelect) {
    1415    Rmin = graph[0].coords.crval1 - 182.0;

  • trunk/Ohana/src/opihi/dvo/Makefile

    r4585 r4689  
    77LIB     =       $(HOME)/lib
    88INC     =       $(HOME)/include
    9 HELP    =       $(HOME)/help
    109SDIR    =       $(HOME)/dvo
    1110#
    … …  
    1413DESTINC =       $(LINC)
    1514DESTMAN =       $(LMAN)
     15DESTHLP =       $(LHLP)/dvo
    1616# 
    1717INCS    =       -I$(INC) -I$(LINC) -I$(XINC)
    … …  
    2020LIBS2   =       -lbasiccmd -ldatacmd -lastrocmd -lshell -ldata
    2121LIBS    =       $(LIBS2) $(LIBS1)
    22 CFLAGS  =       $(INCS)
     22CFLAGS  =       $(INCS) -DHELPDIR_DEFAULT=$(DESTHLP)
    2323CCFLAGS =       $(LIBS)
    2424
    … …  
    100100$(BIN)/dvo.$(ARCH) : $(dvo) $(libs)
    101101
    102 install: $(DESTBIN)/dvo
     102install: $(DESTBIN)/dvo help
     103
     104help: cmd.basic.help cmd.data.help cmd.astro.help dvo.help
    103105
    104106# utilities #################################################
    … …  
    153155        $(CC) $(CFLAGS) -c $*.c -o $@
    154156
    155 
     157%.help:
     158        @if [ ! -d $(DESTHLP) ]; then mkdir -p $(DESTHLP); fi
     159        rm -f $(HOME)/$*/help/*~
     160        rm -f $(HOME)/$*/help/#*
     161        cp $(HOME)/$*/help/* $(DESTHLP)/
    156162
    157163## -*- makefile -*-

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

    r4606 r4689  
    44 
    55  int i, j, m, N, NPTS, param;
    6   int Ngraph, Nsec, Nregions, mode;
     6  int Nsec, Nregions, mode;
    77  char filename[256], catdir[256], *RegionName, *RegionList, *p;
    88

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

    r3462 r4689  
    2424  }
    2525 
     26  Cross = FALSE;
    2627  First = FALSE;
     28  nominal = 1;
    2729  if (!strcmp (argv[1], "-image")) {
    2830    First = TRUE;
    … …  
    3133    entry = atof(argv[1]);
    3234    nominal = atof(argv[2]);
    33     Cross = FALSE;
    3435    if (!strcasecmp (argv[1], "x")) {
    3536      Cross = TRUE;

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

    r4585 r4689  
    88  int Nsec, NSTAR;
    99  char filename[256], catdir[256], *RegionName, *RegionList;
    10   double Radius, M1, M2, dM2, color;
     10  double M1, M2, dM2, color;
    1111
    1212  Catalog catalog;
    … …  
    2222  RegionName = NULL;
    2323  RegionList = NULL;
     24  vec = NULL;
    2425
    2526  /* load photcode information */
    … …  
    8788      /* find data for filter 2 (PHOT_REF) */
    8889      M2 = NO_MAG;
     90      dM2 = NO_MAG;
    8991      for (j = 0; j < catalog.average[i].Nm; j++) {
    9092        if (catalog.measure[m+j].source != code[1][0].code) continue;

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

    r4606 r4689  
    99  int NSTAR, Nstar, Nsec, Nregions;
    1010  char filename[256], catdir[256], *RegionName, *RegionList;
    11   double *M1, M2, dM2, color, Radius;
     11  double *M1, M2, dM2, color;
    1212
    1313  Catalog catalog;
    … …  
    2323  RegionName = NULL;
    2424  RegionList = NULL;
     25  vec = NULL;
    2526
    2627  /* load photcode information */
    … …  
    100101      /* find data for filter 2 (REF) */
    101102      M2 = NO_MAG;
     103      dM2 = NO_MAG;
    102104      for (j = 0; j < catalog.average[i].Nm; j++) {
    103105        if (catalog.measure[m+j].source != code[1][0].code) continue;

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

    r3462 r4689  
    7676  current_epoch = 2000.0;
    7777  epoch = 2000.0;
    78   if (N = get_argument (argc, argv, "-e")) {
     78  if ((N = get_argument (argc, argv, "-e"))) {
    7979    remove_argument (N, &argc, argv);
    8080    epoch  = atof(argv[N]);
    … …  
    8282  }
    8383
     84  IDchoice = 0;
    8485  IDclip = FALSE;
    85   if (N = get_argument (argc, argv, "-ID")) {
     86  if ((N = get_argument (argc, argv, "-ID"))) {
    8687    remove_argument (N, &argc, argv);
    8788    IDchoice  = atof(argv[N]);
    … …  
    9192
    9293  LimExclude = FALSE;
    93   if (N = get_argument (argc, argv, "-x")) {
     94  if ((N = get_argument (argc, argv, "-x"))) {
    9495    remove_argument (N, &argc, argv);
    9596    LimExclude = TRUE;
    9697  }
    9798
    98   if (Nm = get_argument (argc, argv, "-m")) {
     99  if ((Nm = get_argument (argc, argv, "-m"))) {
    99100    remove_argument (Nm, &argc, argv);
    100101    Mr  = 1000*atof(argv[Nm]);
    … …  
    105106  }
    106107
    107   if (Nn = get_argument (argc, argv, "+n")) {
     108  if ((Nn = get_argument (argc, argv, "+n"))) {
    108109    remove_argument (Nn, &argc, argv);
    109110    Nz  = atof(argv[Nn]);
    … …  
    113114  }
    114115
    115   if (Nn = get_argument (argc, argv, "-n")) {
     116  if ((Nn = get_argument (argc, argv, "-n"))) {
    116117    remove_argument (Nn, &argc, argv);
    117118    Nz  = atof(argv[Nn]);
    … …  
    122123
    123124  InRegion = FALSE;
    124   if (N = get_argument (argc, argv, "-all")) {
     125  if ((N = get_argument (argc, argv, "-all"))) {
    125126    remove_argument (N, &argc, argv);
    126127    InRegion = TRUE;
    127128  }
    128129
     130  Bytes_Star = 0;
    129131  ASCII = FALSE;
    130132  DVO = TRUE;
    131133  GSC = FALSE;
    132134  FIXED = FALSE;
    133   if (N = get_argument (argc, argv, "-g")) {
     135  if ((N = get_argument (argc, argv, "-g"))) {
    134136    remove_argument (N, &argc, argv);
    135137    GSC = TRUE;
    … …  
    138140  }
    139141
    140   if (N = get_argument (argc, argv, "-a")) {
     142  if ((N = get_argument (argc, argv, "-a"))) {
    141143    remove_argument (N, &argc, argv);
    142144    ASCII = TRUE;
    … …  
    149151    Am = atof(argv[N]);
    150152    remove_argument (N, &argc, argv);
    151     if (N = get_argument (argc, argv, "-f")) {
     153    if ((N = get_argument (argc, argv, "-f"))) {
    152154      remove_argument (N, &argc, argv);
    153155      FIXED = TRUE;

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

    r4679 r4689  
    44 
    55  char filename[256], catdir[256], *RegionName, *RegionList;
    6   double Radius;
    76  double *M1, *M2;
    87  int i, m, k, Npts, NPTS, N;
    98  int N1, N2, i1, i2, mode[4];
    10   int Ngraph, Nsec, Nregions, KeepNulls;
     9  int Nsec, Nregions, KeepNulls;
    1110
    1211  Catalog catalog;
    … …  
    3534
    3635  KeepNulls = FALSE;
    37   if (N = get_argument (argc, argv, "-nulls")) {
     36  if ((N = get_argument (argc, argv, "-nulls"))) {
    3837    KeepNulls = TRUE;
    3938    remove_argument (N, &argc, argv);

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

    r4679 r4689  
    44 
    55  char filename[256], catdir[256], *RegionName, *RegionList;
    6   double Radius, *M1, *M3;
     6  double *M1, *M3;
    77  int i, j, m, i1, i3, N1, N3, N;
    88  int Npts, NPTS, mode[3];
    9   int Ngraph, Nsec, Nregions, KeepNulls;
     9  int Nsec, Nregions, KeepNulls;
    1010
    1111  Catalog catalog;
    12   Graphdata graphsky;
    1312  RegionFile *regions;
    1413  PhotCode *code[3];
    … …  
    3534
    3635  KeepNulls = FALSE;
    37   if (N = get_argument (argc, argv, "-nulls")) {
     36  if ((N = get_argument (argc, argv, "-nulls"))) {
    3837    KeepNulls = TRUE;
    3938    remove_argument (N, &argc, argv);

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

    r3693 r4689  
    1717 
    1818  Nimage = -1;
    19   if (N = get_argument (argc, argv, "-n")) {
     19  if ((N = get_argument (argc, argv, "-n"))) {
    2020    remove_argument (N, &argc, argv);
    2121    Nimage = atof (argv[N]);
    … …  
    2525
    2626  Type = 0;
    27   if (N = get_argument (argc, argv, "-t")) {
     27  if ((N = get_argument (argc, argv, "-t"))) {
    2828    remove_argument (N, &argc, argv);
    2929    Type = atof (argv[N]);

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

    r3462 r4689  
    2323    return (FALSE);
    2424  }
     25
     26  R = D = V = NULL;
     27  file = NULL;
     28  name = NULL;
     29  Nfield = Nra = Ndec = 0;
     30  RAnDEC = FALSE;
    2531
    2632  if (argc == 4) {

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

    r4679 r4689  
    44 
    55  char filename[256], catdir[256], *RegionName, *RegionList;
    6   double Radius;
    76  double *M1, *M2;
    87  int i, m, k, N, Npts, NPTS;
    98  int N1, N2, i1, i2, mode[4];
    10   int Ngraph, Nsec, Nregions, KeepNulls;
     9  int Nsec, Nregions, KeepNulls;
    1110
    1211  Catalog catalog;
    … …  
    3534
    3635  KeepNulls = FALSE;
    37   if (N = get_argument (argc, argv, "-nulls")) {
     36  if ((N = get_argument (argc, argv, "-nulls"))) {
    3837    KeepNulls = TRUE;
    3938    remove_argument (N, &argc, argv);

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

    r3622 r4689  
    44enum {ZERO, DTIME, SKY, BIAS, FWHM, AIRM, TIME, TEMP};
    55
    6 detrend (int argc, char **argv) {
     6int detrend (int argc, char **argv) {
    77 
    88  FILE *f;
    … …  
    2525
    2626  TimeSelect = FALSE;
    27   if (N = get_argument (argc, argv, "-time")) {
     27  if ((N = get_argument (argc, argv, "-time"))) {
    2828    remove_argument (N, &argc, argv);
    2929    if (!str_to_time (argv[N], &tzero)) {
    … …  
    4343    TimeSelect = TRUE;
    4444  }
    45   if (N = get_argument (argc, argv, "-trange")) {
     45  if ((N = get_argument (argc, argv, "-trange"))) {
    4646    remove_argument (N, &argc, argv);
    4747    if (!str_to_time (argv[N], &tzero)) {
    … …  
    6363  }
    6464 
     65  Type = 0;
    6566  TypeSelect = FALSE;
    66   if (N = get_argument (argc, argv, "-type")) {
     67  if ((N = get_argument (argc, argv, "-type"))) {
    6768    remove_argument (N, &argc, argv);
    6869    Type = get_image_type (argv[N]);
    … …  
    7576  }
    7677
     78  CCD = 0;
    7779  CCDSelect = FALSE;
    78   if (N = get_argument (argc, argv, "-ccd")) {
     80  if ((N = get_argument (argc, argv, "-ccd"))) {
    7981    remove_argument (N, &argc, argv);
    8082    CCD = atoi (argv[N]);
    … …  
    8385  }
    8486 
     87  Filter = NULL;
    8588  FilterSelect = FALSE;
    86   if (N = get_argument (argc, argv, "-filter")) {
     89  if ((N = get_argument (argc, argv, "-filter"))) {
    8790    remove_argument (N, &argc, argv);
    8891    Filter = strcreate (argv[N]);
    … …  
    149152
    150153  GetTimeFormat (&TimeReference, &TimeFormat);
    151   fprintf (stderr, "%d %d\n", TimeReference, TimeFormat);
     154  fprintf (stderr, "%ld %d\n", TimeReference, TimeFormat);
    152155
    153156  /* get data */

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

    r4679 r4689  
    44 
    55  char filename[256], catdir[256], *RegionName, *RegionList;
    6   double Radius, *M1, M2;
    7   int i, j, k, m, N1, N;
     6  double *M1, M2;
     7  int i, j, k, m, N1;
    88  int Npts, NPTS, param, mode[3];
    9   int Ngraph, Nsec, Nregions;
     9  int Nsec, Nregions;
    1010
    1111  Catalog catalog;

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

    r4679 r4689  
    44 
    55  char filename[256], catdir[256], *RegionName, *RegionList;
    6   double Radius, *M1, *M3;
    7   int i, j, k, m, i1, i3, N1, N3, N;
     6  double *M1, *M3;
     7  int i, j, m, i1, i3, N1, N3, N;
    88  int Npts, NPTS, param, mode[3];
    9   int Ngraph, Nsec, Nregions, KeepNulls;
     9  int Nsec, Nregions, KeepNulls;
    1010
    1111  Catalog catalog;
    … …  
    3535
    3636  KeepNulls = FALSE;
    37   if (N = get_argument (argc, argv, "-nulls")) {
     37  if ((N = get_argument (argc, argv, "-nulls"))) {
    3838    KeepNulls = TRUE;
    3939    remove_argument (N, &argc, argv);

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

    r4679 r4689  
    44 
    55  char filename[256], catdir[256], *RegionName, *RegionList;
    6   double Radius, *M1, *M3;
     6  double *M1, *M3;
    77  int i, j, m, i1, i3, N1, N3, N;
    88  int Npts, NPTS, mode[3];
    … …  
    3434
    3535  KeepNulls = FALSE;
    36   if (N = get_argument (argc, argv, "-nulls")) {
     36  if ((N = get_argument (argc, argv, "-nulls"))) {
    3737    KeepNulls = TRUE;
    3838    remove_argument (N, &argc, argv);

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

    r3462 r4689  
    2020  if (!InitPhotcodes ()) return (FALSE);
    2121
     22  vec1 = vec2 = vec3 = vec4 = vec5 = NULL;
    2223  SaveVectors = FALSE;
    23   if (N = get_argument (argc, argv, "-vect")) {
     24  if ((N = get_argument (argc, argv, "-vect"))) {
    2425    remove_argument (N, &argc, argv);
    2526    if ((vec1 = SelectVector ("dmtdmt", ANYVECTOR, TRUE)) == NULL) return (FALSE);

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

    r2598 r4689  
    1 # include "opihi.h"
     1# include "dvo1.h"
    22
    33# define opihi_name "DVO"
    … …  
    77# define opihi_rcfile ".dvorc"
    88
    9 void InitBasic ();
    10 void InitData ();
    11 void InitAstro ();
    12 void InitDVO ();
    13 
    14 void welcome () {
    15   fprintf (stderr, "\n");
    16   fprintf (stderr, "Welcome to %s - %s\n\n", opihi_name, opihi_description);
    17 }
    18 
    199/* program-dependent initialization */
    2010void initialize (int argc, char **argv) {
    2111 
    22   FILE *f;
    23 
    2412  auto_break = TRUE;
    2513
    … …  
    4230  InitBasic ();
    4331  InitData ();
     32  InitOutfile ();
    4433  InitAstro ();
    4534  InitDVO ();
    46   InitOutfile ();
    4735
    4836  rl_readline_name = opihi_name;
    … …  
    5240  set_str_variable ("PROMPT", opihi_prompt);
    5341  set_str_variable ("RCFILE", opihi_rcfile);
     42# ifdef HELPDIR_DEFAULT
     43  set_str_variable ("HELPDIR", MACRO_NAME(HELPDIR_DEFAULT));
     44# endif
    5445
    55   /* here we open the history file for append.  it this fails, we
    56      won't be able to write to it, warn the user.  otherwise, this
    57      creates the file readline will write to, if it did not exist */ 
    58 
    59   /* check history file */
    60   /* rewrite with fstat or stat */
    61   f = fopen (opihi_history, "a");
    62   if (f == NULL) /* no current history file here */
    63     fprintf (stderr, "can't save history.\n");
    64   else
    65     fclose (f);
    66  
    67   stifle_history (200);
    68   read_history (opihi_history);
     46  { /* check history file permission */
     47    FILE *f;
     48    f = fopen (opihi_history, "a");
     49    if (f == NULL) /* no current history file here */
     50      fprintf (stderr, "can't save history.\n");
     51    else
     52      fclose (f);
     53    stifle_history (200);
     54    read_history (opihi_history);
     55  }
    6956
    7057  signal (SIGINT, SIG_IGN);
    … …  
    7259}
    7360
     61/* standard welcome message */
     62void welcome () {
     63  fprintf (stderr, "\n");
     64  fprintf (stderr, "Welcome to %s - %s\n\n", opihi_name, opihi_description);
     65}
     66
    7467/* add program-dependent exit functions here */
    7568void cleanup () {
    76   /* -libdisplay */
    7769  QuitImage ();
    7870  QuitGraph ();

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

    r4585 r4689  
    11# include "dvo1.h"
     2
     3int WriteMsg (char *fifo, char *message);
     4int ReadMsg (char *fifo, char **message);
    25
    36int elixir (int argc, char **argv) {
    … …  
    912
    1013  sprintf (cmd, "STATUS");
    11   if (N = get_argument (argc, argv, "-time")) {
     14  if ((N = get_argument (argc, argv, "-time"))) {
    1215    remove_argument (N, &argc, argv);
    1316    sprintf (cmd, "TIMES");
    1417  }
    15   if (N = get_argument (argc, argv, "-live")) {
     18  if ((N = get_argument (argc, argv, "-live"))) {
    1619    remove_argument (N, &argc, argv);
    1720    sprintf (cmd, "ALIVE");
    1821  }
    19   if (N = get_argument (argc, argv, "-stop")) {
     22  if ((N = get_argument (argc, argv, "-stop"))) {
    2023    remove_argument (N, &argc, argv);
    2124    sprintf (cmd, "STOP");
    2225  }
    23   if (N = get_argument (argc, argv, "-kill")) {
     26  if ((N = get_argument (argc, argv, "-kill"))) {
    2427    remove_argument (N, &argc, argv);
    2528    sprintf (cmd, "ABORT");

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

    r3462 r4689  
    154154 
    155155}
     156

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

    r4585 r4689  
    1010int fitcolors (int argc, char **argv) {
    1111 
    12   int *list, Nlist, Ncode;
     12  int *list, Nlist;
    1313  int i, k, m, NP1, NP2, NP, Np, Npts, NPTS;
    1414  int N1, N2, i1, i2, mode[4];
    15   int Nsec, Nregions, Ncatalog, status;
     15  int Nsec, Nregions, status;
    1616  char catdir[256], filename[256], *RegionName, *RegionList;
    1717  char *cmd, *outcmd, *camera;
    18   double Radius;
    1918  double *M1, *M2;
    2019  float *out;
    … …  
    200199  DeleteVector (xvec);
    201200  DeleteVector (yvec);
    202   free_catalog (catalog, Ncatalog);
     201  free_catalog (catalog, Nregions);
     202  return (FALSE);
    203203}
    204204

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

    r3462 r4689  
    1818
    1919  TimeSelect = FALSE;
    20   if (N = get_argument (argc, argv, "-time")) {
     20  if ((N = get_argument (argc, argv, "-time"))) {
    2121    remove_argument (N, &argc, argv);
    2222    if (!str_to_time (argv[N], &tzero)) {
    … …  
    3232    TimeSelect = TRUE;
    3333  }
    34   if (N = get_argument (argc, argv, "-tref")) {
     34  if ((N = get_argument (argc, argv, "-tref"))) {
    3535    remove_argument (N, &argc, argv);
    3636    TimeSelect = TRUE;
    … …  
    4747  }
    4848
     49  code = NULL;
    4950  PhotCodeSelect = FALSE;
    50   if (N = get_argument (argc, argv, "-photcode")) {
     51  if ((N = get_argument (argc, argv, "-photcode"))) {
    5152    remove_argument (N, &argc, argv);
    5253    if ((code = GetPhotcodebyName (argv[N])) == NULL) {
    … …  
    5960
    6061  PixelCoords = FALSE;
    61   if (N = get_argument (argc, argv, "-pix")) {
     62  if ((N = get_argument (argc, argv, "-pix"))) {
    6263    remove_argument (N, &argc, argv);
    6364    PixelCoords = TRUE;

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

    r3462 r4689  
    77  char filename[128], catdir[256], *date;
    88  double Ra, Dec, Radius, Radius2, r, dec0, dec1;
    9   double t, Mcat, Mrel;
     9  double Mcat, Mrel;
    1010  float *RA, *DEC;
    1111  int i, j, k, m, N, *N1, Nregions, Nsec, NPTS;
    … …  
    2121  Nsec = GetPhotcodeNsecfilt ();
    2222
     23  NPTS = 0;
     24  vec1 = vec2 = vec3 = vec4 = NULL;
    2325  SaveVectors = FALSE;
    24   if (N = get_argument (argc, argv, "-save")) {
     26  if ((N = get_argument (argc, argv, "-save"))) {
    2527    remove_argument (N, &argc, argv);
    2628    SaveVectors = TRUE;
    … …  
    3234
    3335  GetMeasures = FALSE;
    34   if (N = get_argument (argc, argv, "-m")) {
     36  if ((N = get_argument (argc, argv, "-m"))) {
    3537    GetMeasures = TRUE;
    3638    remove_argument (N, &argc, argv);
    … …  
    170172          if (SaveVectors) {
    171173            vec1[0].elements[N] = Mcat;
    172             vec2[0].elements[N] = t;
     174            vec2[0].elements[N] = catalog.measure[m].t;
    173175            vec3[0].elements[N] = 0.001*catalog.measure[m].airmass;
    174176            vec4[0].elements[N] = catalog.measure[m].source;

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

    r3462 r4689  
    1717
    1818  ByName = FALSE;
    19   if (N = get_argument (argc, argv, "-name")) {
     19  if ((N = get_argument (argc, argv, "-name"))) {
    2020    remove_argument (N, &argc, argv);
    2121    strcpy (name, argv[N]);
    … …  
    2525
    2626  TimeSelect = FALSE;
    27   if (N = get_argument (argc, argv, "-time")) {
     27  if ((N = get_argument (argc, argv, "-time"))) {
    2828    remove_argument (N, &argc, argv);
    2929    if (!str_to_time (argv[N], &tzero)) {
    … …  
    4343    TimeSelect = TRUE;
    4444  }
    45   if (N = get_argument (argc, argv, "-trange")) {
     45  if ((N = get_argument (argc, argv, "-trange"))) {
    4646    remove_argument (N, &argc, argv);
    4747    if (!str_to_time (argv[N], &tzero)) {

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

    r4585 r4689  
    1616  Vector *vec;
    1717
     18  start = stop = 0;
    1819  TimeSelect = FALSE;
    19   if (N = get_argument (argc, argv, "-time")) {
     20  if ((N = get_argument (argc, argv, "-time"))) {
    2021    remove_argument (N, &argc, argv);
    2122    if (!str_to_time (argv[N], &tzero)) {

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

    r3462 r4689  
    2121  /* check for time-based selection */
    2222  TimeSelect = FALSE;
    23   if (N = get_argument (argc, argv, "-time")) {
     23  if ((N = get_argument (argc, argv, "-time"))) {
    2424    remove_argument (N, &argc, argv);
    2525    if (!str_to_time (argv[N], &tzero)) {
    … …  
    3838  /* check for region-based selection */
    3939  RegionSelect = FALSE;
    40   if (N = get_argument (argc, argv, "-region")) {
     40  if ((N = get_argument (argc, argv, "-region"))) {
    4141    remove_argument (N, &argc, argv);
    4242    RegionSelect = TRUE;
    … …  
    4444
    4545  /* check for region-based selection */
     46  FlagValue = 0;
    4647  FlagSelect = FALSE;
    47   if (N = get_argument (argc, argv, "-flag")) {
     48  if ((N = get_argument (argc, argv, "-flag"))) {
    4849    remove_argument (N, &argc, argv);
    4950    FlagValue = atoi (argv[N]);
    … …  
    5556  code = NULL;
    5657  PhotcodeSelect = FALSE;
    57   if (N = get_argument (argc, argv, "-photcode")) {
     58  if ((N = get_argument (argc, argv, "-photcode"))) {
    5859    PhotcodeSelect = TRUE;
    5960    remove_argument (N, &argc, argv);

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

    r3462 r4689  
    1717
    1818  TimeSelect = FALSE;
    19   if (N = get_argument (argc, argv, "-time")) {
     19  if ((N = get_argument (argc, argv, "-time"))) {
    2020    remove_argument (N, &argc, argv);
    2121    if (!str_to_time (argv[N], &tzero)) {
    … …  
    3434
    3535  RegionSelect = FALSE;
    36   if (N = get_argument (argc, argv, "-region")) {
     36  if ((N = get_argument (argc, argv, "-region"))) {
    3737    remove_argument (N, &argc, argv);
    3838    RegionSelect = TRUE;
    3939  }
    4040
     41  PhotcodeValue = NULL;
    4142  PhotcodeSelect = FALSE;
    42   if (N = get_argument (argc, argv, "-photcode")) {
     43  if ((N = get_argument (argc, argv, "-photcode"))) {
    4344    PhotcodeSelect = TRUE;
    4445    remove_argument (N, &argc, argv);
    … …  
    5152  }
    5253
     54  name = NULL;
    5355  NameSelect = FALSE;
    54   if (N = get_argument (argc, argv, "-name")) {
     56  if ((N = get_argument (argc, argv, "-name"))) {
    5557    remove_argument (N, &argc, argv);
    5658    name = strcreate (argv[N]);

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

    r3462 r4689  
    1414
    1515  GreyScale = FALSE;
    16   if (N = get_argument (argc, argv, "-g")) {
     16  if ((N = get_argument (argc, argv, "-g"))) {
    1717    remove_argument (N, &argc, argv);
    1818    strcpy (bufname, argv[N]);
    … …  
    2626  }
    2727
     28  buf = NULL;
    2829  if (GreyScale) {
    2930    if ((buf = SelectBuffer (bufname, ANYBUFFER, TRUE)) == NULL) return (FALSE);

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

    r3622 r4689  
    66static char valuename[NVALUE][32] = {"none", "exptime", "ccd", "sky", "bias", "filter", "fwhm", "airmass", "time", "temp0", "temp1", "temp2", "temp3", "telfocus", "xprobe", "yprobe", "zprobe", "ra", "dec", "dettemp", "rotangle", "regtime"};
    77
    8 imrough (int argc, char **argv) {
     8int imrough (int argc, char **argv) {
    99 
    1010  int i, N, Nimage, TimeSelect;
    … …  
    2121
    2222  TimeSelect = FALSE;
    23   if (N = get_argument (argc, argv, "-time")) {
     23  if ((N = get_argument (argc, argv, "-time"))) {
    2424    remove_argument (N, &argc, argv);
    2525    if (!str_to_time (argv[N], &tzero)) {
    … …  
    3939    TimeSelect = TRUE;
    4040  }
    41   if (N = get_argument (argc, argv, "-trange")) {
     41  if ((N = get_argument (argc, argv, "-trange"))) {
    4242    remove_argument (N, &argc, argv);
    4343    if (!str_to_time (argv[N], &tzero)) {
    … …  
    6161  type = T_UNDEF;
    6262  TypeSelect = FALSE;
    63   if (N = get_argument (argc, argv, "-type")) {
     63  if ((N = get_argument (argc, argv, "-type"))) {
    6464    TypeSelect = TRUE;
    6565    remove_argument (N, &argc, argv);
    … …  
    7474  mode = M_NONE;
    7575  ModeSelect = FALSE;
    76   if (N = get_argument (argc, argv, "-mode")) {
     76  if ((N = get_argument (argc, argv, "-mode"))) {
    7777    ModeSelect = TRUE;
    7878    remove_argument (N, &argc, argv);
    … …  
    8585  }
    8686
     87  CCD = 0;
    8788  CCDSelect = FALSE;
    88   if (N = get_argument (argc, argv, "-ccd")) {
     89  if ((N = get_argument (argc, argv, "-ccd"))) {
    8990    remove_argument (N, &argc, argv);
    9091    CCD = atoi (argv[N]);
    … …  
    9394  }
    9495 
     96  Filter = NULL;
    9597  FilterSelect = FALSE;
    96   if (N = get_argument (argc, argv, "-filter")) {
     98  if ((N = get_argument (argc, argv, "-filter"))) {
    9799    remove_argument (N, &argc, argv);
    98100    Filter = strcreate (argv[N]);

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

    r3462 r4689  
    11# include "dvo1.h"
    22
    3 imsearch (int argc, char **argv) {
     3int imsearch (int argc, char **argv) {
    44 
    55  char DataBase[256], name[64];
    … …  
    1717
    1818  SaveNames = FALSE;
    19   if (N = get_argument (argc, argv, "-save")) {
     19  if ((N = get_argument (argc, argv, "-save"))) {
    2020    remove_argument (N, &argc, argv);
    2121    SaveNames = TRUE;
    … …  
    2323 
    2424  TimeSelect = FALSE;
    25   if (N = get_argument (argc, argv, "-time")) {
     25  if ((N = get_argument (argc, argv, "-time"))) {
    2626    remove_argument (N, &argc, argv);
    2727    if (!str_to_time (argv[N], &tzero)) {
    … …  
    3838  }
    3939 
     40  Type = 0;
    4041  TypeSelect = FALSE;
    41   if (N = get_argument (argc, argv, "-type")) {
     42  if ((N = get_argument (argc, argv, "-type"))) {
    4243    remove_argument (N, &argc, argv);
    4344    Type = get_image_type (argv[N]);
    … …  
    5051  }
    5152 
     53  Mode = 0;
    5254  ModeSelect = FALSE;
    53   if (N = get_argument (argc, argv, "-mode")) {
     55  if ((N = get_argument (argc, argv, "-mode"))) {
    5456    remove_argument (N, &argc, argv);
    5557    Mode = get_image_mode (argv[N]);
    … …  
    6264  }
    6365 
     66  CCD = 0;
    6467  CCDSelect = FALSE;
    65   if (N = get_argument (argc, argv, "-ccd")) {
     68  if ((N = get_argument (argc, argv, "-ccd"))) {
    6669    remove_argument (N, &argc, argv);
    6770    CCD = atoi (argv[N]);
    … …  
    7073  }
    7174 
     75  Filter = NULL;
    7276  FilterSelect = FALSE;
    73   if (N = get_argument (argc, argv, "-filter")) {
     77  if ((N = get_argument (argc, argv, "-filter"))) {
    7478    remove_argument (N, &argc, argv);
    7579    Filter = strcreate (argv[N]);

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

    r3462 r4689  
    1111
    1212  Ngraph = -1;
    13   if (N = get_argument (argc, argv, "-n")) {
     13  if ((N = get_argument (argc, argv, "-n"))) {
    1414    remove_argument (N, &argc, argv);
    1515    Ngraph = atof (argv[N]);
    … …  
    1919
    2020  Mcal = TRUE;
    21   if (N = get_argument (argc, argv, "-dM")) {
     21  if ((N = get_argument (argc, argv, "-dM"))) {
    2222    remove_argument (N, &argc, argv);
    2323    Mcal = FALSE;
    … …  
    2525
    2626  AutoLimits = FALSE;
    27   if (N = get_argument (argc, argv, "-l")) {
     27  if ((N = get_argument (argc, argv, "-l"))) {
    2828    remove_argument (N, &argc, argv);
    2929    AutoLimits = TRUE;

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

    r3462 r4689  
    1818
    1919  ShowAll = FALSE;
    20   if (N = get_argument (argc, argv, "-all")) {
     20  if ((N = get_argument (argc, argv, "-all"))) {
    2121    remove_argument (N, &argc, argv);
    2222    ShowAll = TRUE;

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

    r3462 r4689  
    2121
    2222  Ngraph = -1;
    23   if (N = get_argument (argc, argv, "-n")) {
     23  if ((N = get_argument (argc, argv, "-n"))) {
    2424    remove_argument (N, &argc, argv);
    2525    Ngraph = atof (argv[N]);
    … …  
    2929
    3030  AutoLimits = FALSE;
    31   if (N = get_argument (argc, argv, "-l")) {
     31  if ((N = get_argument (argc, argv, "-l"))) {
    3232    remove_argument (N, &argc, argv);
    3333    AutoLimits = TRUE;
    3434  }
    3535
     36  xvec = yvec = NULL;
    3637  SaveVectors = FALSE;
    37   if (N = get_argument (argc, argv, "-v")) {
     38  if ((N = get_argument (argc, argv, "-v"))) {
    3839    remove_argument (N, &argc, argv);
    3940    SaveVectors = TRUE;
    … …  
    4546
    4647  AbsPhot = FALSE;
    47   if (N = get_argument (argc, argv, "-abs")) {
     48  if ((N = get_argument (argc, argv, "-abs"))) {
    4849    remove_argument (N, &argc, argv);
    4950    AbsPhot = TRUE;
    … …  
    5152
    5253  GalMag = FALSE;
    53   if (N = get_argument (argc, argv, "-gal")) {
     54  if ((N = get_argument (argc, argv, "-gal"))) {
    5455    fprintf (stderr, "galaxy magnitudes currently disabled\n");
    5556    return (FALSE);
    … …  
    5758
    5859  ErrorBars = FALSE;
    59   if (N = get_argument (argc, argv, "-d")) {
     60  if ((N = get_argument (argc, argv, "-d"))) {
    6061    remove_argument (N, &argc, argv);
    6162    ErrorBars = TRUE;

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

    r3461 r4689  
    2828  }
    2929
     30  code = NULL;
    3031  PhotCodeSelect = FALSE;
    3132  if ((N = get_argument (argc, argv, "-photcode"))) {

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

    r4606 r4689  
    66  int param, mode, Nregions, Nsec;
    77  char filename[128], catdir[256], *RegionName, *RegionList, *p;
    8   double Radius, *M1;
     8  double *M1;
    99
    1010  PhotCode *code;

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

    r3462 r4689  
    1717
    1818  ShowAll = FALSE;
    19   if (N = get_argument (argc, argv, "-all")) {
     19  if ((N = get_argument (argc, argv, "-all"))) {
    2020    remove_argument (N, &argc, argv);
    2121    ShowAll = TRUE;

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

    r4681 r4689  
    329329  double trange;
    330330
    331   if (N = get_argument (*argc, argv, "-phothelp")) {
     331  if ((N = get_argument (*argc, argv, "-phothelp"))) {
    332332    fprintf (stderr, "optional photometry selection criteria:\n");
    333333    fprintf (stderr, " -magrange min max\n");
    … …  
    346346  /* select based on measured mag (MEASURE ONLY) */
    347347  MagSelect = FALSE;
    348   if (N = get_argument (*argc, argv, "-magrange")) {
     348  if ((N = get_argument (*argc, argv, "-magrange"))) {
    349349    MagSelect = TRUE;
    350350    remove_argument (N, argc, argv);
    … …  
    357357  /* select based on instrument mag (MEASURE ONLY) */
    358358  iMagSelect = FALSE;
    359   if (N = get_argument (*argc, argv, "-imaglim")) {
     359  if ((N = get_argument (*argc, argv, "-imaglim"))) {
    360360    iMagSelect = TRUE;
    361361    remove_argument (N, argc, argv);
    … …  
    366366  /* select on value of flag (MEASURE ONLY) */
    367367  FlagSelect = FALSE;
    368   if (N = get_argument (*argc, argv, "-flag")) {
     368  if ((N = get_argument (*argc, argv, "-flag"))) {
    369369    FlagSelect = TRUE;
    370370    remove_argument (N, argc, argv);
    … …  
    375375  /* select on value of Chisq (AVERAGE ONLY) */
    376376  for (i = 0; i < 4; i++) ApplySelections[i] = TRUE;
    377   if (N = get_argument (*argc, argv, "-apply")) {
     377  if ((N = get_argument (*argc, argv, "-apply"))) {
    378378    remove_argument (N, argc, argv);
    379379    if (strlen(argv[N]) != Nparams) {
    … …  
    393393  /* select on value of photcode */
    394394  PhotcodeSelect = FALSE;
    395   if (N = get_argument (*argc, argv, "-photcode")) {
     395  if ((N = get_argument (*argc, argv, "-photcode"))) {
    396396    PhotcodeSelect = TRUE;
    397397    remove_argument (N, argc, argv);
    … …  
    406406  /* selection on basis of time range (MEASURE only) */
    407407  TimeSelect = FALSE;
    408   if (N = get_argument (*argc, argv, "-time")) {
     408  if ((N = get_argument (*argc, argv, "-time"))) {
    409409    remove_argument (N, argc, argv);
    410410    if (!str_to_time (argv[N], &tzero)) {
    … …  
    430430  /* select by error (on measure or average) */
    431431  ErrSelect = FALSE;
    432   if (N = get_argument (*argc, argv, "-errorlim")) {
     432  if ((N = get_argument (*argc, argv, "-errorlim"))) {
    433433    remove_argument (N, argc, argv);
    434434    ErrValue = 1000*atof (argv[N]);
    … …  
    439439  /* select on value of Chisq (AVERAGE ONLY) */
    440440  ChiSelect = FALSE;
    441   if (N = get_argument (*argc, argv, "-chisq")) {
     441  if ((N = get_argument (*argc, argv, "-chisq"))) {
    442442    ChiSelect = TRUE;
    443443    remove_argument (N, argc, argv);
    … …  
    448448  /* select on measurement type: 1,2,3 (AVERAGE ONLY) */
    449449  TypeSelect = FALSE;
    450   if (N = get_argument (*argc, argv, "-type")) {
     450  if ((N = get_argument (*argc, argv, "-type"))) {
    451451    remove_argument (N, argc, argv);
    452452    TypeValue = atoi (argv[N]);
    … …  
    457457  /* select on measurement type: 1,2,3 (AVERAGE ONLY) */
    458458  TypefracType = 0;
    459   if (N = get_argument (*argc, argv, "-usetype")) {
     459  if ((N = get_argument (*argc, argv, "-usetype"))) {
    460460    remove_argument (N, argc, argv);
    461461    TypefracType = atoi (argv[N]);
    … …  
    465465  /* select on measurement type: 1,2,3 (AVERAGE ONLY) */
    466466  TypefracSelect = FALSE;
    467   if (N = get_argument (*argc, argv, "-typefrac")) {
     467  if ((N = get_argument (*argc, argv, "-typefrac"))) {
    468468    remove_argument (N, argc, argv);
    469469    TypefracType  = atoi (argv[N]);
    … …  
    479479  /* select by number of measurements (AVERAGE ONLY) */
    480480  NphotSelect = FALSE;
    481   if (N = get_argument (*argc, argv, "-nphot")) {
     481  if ((N = get_argument (*argc, argv, "-nphot"))) {
    482482    remove_argument (N, argc, argv);
    483483    NphotValue = abs (atoi (argv[N]));
    … …  
    491491  /* select by number of measurements (AVERAGE ONLY) */
    492492  NcodeSelect = FALSE;
    493   if (N = get_argument (*argc, argv, "-ncode")) {
     493  if ((N = get_argument (*argc, argv, "-ncode"))) {
    494494    remove_argument (N, argc, argv);
    495495    NcodeValue = abs (atoi (argv[N]));
    … …  
    503503  /* -fwhm value frac (AVERAGE ONLY) */
    504504  FWHMSelect = FALSE;
    505   if (N = get_argument (*argc, argv, "-fwhm")) {
     505  if ((N = get_argument (*argc, argv, "-fwhm"))) {
    506506    remove_argument (N, argc, argv);
    507507    FWHMvalue = abs (atof (argv[N]));
    … …  
    522522double *ExtractMeasures (PhotCode *code, int mode, Average *average, SecFilt *secfilt, Measure *measure, int *nlist, int param) {
    523523
    524   int i, k, m, Nlist, NLIST, np, found, Nm;
    525   time_t t;
    526   double ra, dec, x, y, value, M, fwhm;
    527   double *list;
     524  int i, Nlist, NLIST;
     525  double M, *list;
    528526 
    529527  *nlist = 0;
    … …  
    552550double ExtractAverages (PhotCode *code, int mode, Average *average, SecFilt *secfilt, Measure *measure, int param) {
    553551
    554   int i, k, Nm;
     552  int i;
    555553  double value;
    556554
    … …  
    937935
    938936  int i, j, Np0, Np1, Nlist, NLIST;
    939   double *list, M1, M2, value, NoMag;
     937  double *list, M1, M2, NoMag;
    940938 
    941939  *nlist = 0;
    … …  
    10081006double *ExtractMeasuresByDMag (PhotCode **code, int *mode, int use_first, Average *average, SecFilt *secfilt, Measure *measure, int *nlist, int param) {
    10091007
    1010   int i, j, k, n, Nlist, NLIST;
    1011   time_t t;
    1012   int np, found;
    1013   double *list, M1, M2, value;
     1008  int i, j, n, Nlist, NLIST;
     1009  double *list, M1, M2;
    10141010 
    10151011  *nlist = 0;
    … …  
    10501046double GetMeasure (int param, Average *average, Measure *measure, double mag) {
    10511047
    1052   int m;
    10531048  double ra, dec, x, y;
    10541049  double value;

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

    r3462 r4689  
    3131
    3232  PhotcodeClip = -1;
    33   if (N = get_argument (argc, argv, "-p")) {
     33  if ((N = get_argument (argc, argv, "-p"))) {
    3434    remove_argument (N, &argc, argv);
    3535    PhotcodeClip = GetPhotcodeCodebyName (argv[N]);
    3636    remove_argument (N, &argc, argv);
    3737  }
     38  IDchoice = 0;
    3839  IDclip = FALSE;
    39   if (N = get_argument (argc, argv, "-ID")) {
     40  if ((N = get_argument (argc, argv, "-ID"))) {
    4041    remove_argument (N, &argc, argv);
    4142    IDchoice  = atoi(argv[N]);
    … …  
    4344    IDclip = TRUE;
    4445  }
     46  FlagChoice = 0;
    4547  FlagClip = FALSE;
    46   if (N = get_argument (argc, argv, "-flag")) {
     48  if ((N = get_argument (argc, argv, "-flag"))) {
    4749    remove_argument (N, &argc, argv);
    4850    FlagChoice  = atoi(argv[N]);
    … …  
    5254
    5355  LimExclude = FALSE;
    54   if (N = get_argument (argc, argv, "-x")) {
     56  if ((N = get_argument (argc, argv, "-x"))) {
    5557    remove_argument (N, &argc, argv);
    5658    LimExclude = TRUE;
    5759  }
    5860
    59   if (N = get_argument (argc, argv, "-m")) {
     61  if ((N = get_argument (argc, argv, "-m"))) {
    6062    remove_argument (N, &argc, argv);
    6163    Mr  = atof(argv[N]);
    … …  
    6769
    6870  InRegion = FALSE;
    69   if (N = get_argument (argc, argv, "-all")) {
     71  if ((N = get_argument (argc, argv, "-all"))) {
    7072    remove_argument (N, &argc, argv);
    7173    InRegion = TRUE;

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

    r3462 r4689  
    3535  Rmax = graphmode.coords.crval1 + 182.0;
    3636
    37   if (N = get_argument (argc, argv, "-m")) {
     37  if ((N = get_argument (argc, argv, "-m"))) {
    3838    remove_argument (N, &argc, argv);
    3939    Mr  = 1000*atof(argv[N]);
    … …  
    4444  }
    4545
     46  S0 = S1 = 0;
    4647  SpeedClip = FALSE;
    47   if (N = get_argument (argc, argv, "-speed")) {
     48  if ((N = get_argument (argc, argv, "-speed"))) {
    4849    SpeedClip = TRUE;
    4950    remove_argument (N, &argc, argv);
    … …  
    5556
    5657  Reload = FALSE;
    57   if (N = get_argument (argc, argv, "-reload")) {
     58  if ((N = get_argument (argc, argv, "-reload"))) {
    5859    Reload = TRUE;
    5960    remove_argument (N, &argc, argv);

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

    r4585 r4689  
    1515  /* check for Region selection */
    1616  *RegionName = NULL;
    17   if (N = get_argument (*argc, argv, "-cpt")) {
     17  if ((N = get_argument (*argc, argv, "-cpt"))) {
    1818    remove_argument (N, argc, argv);
    1919    *RegionName = strcreate (argv[N]);
    … …  
    2323  /* check for Region list */
    2424  *RegionList = NULL;
    25   if (N = get_argument (*argc, argv, "-cptlist")) {
     25  if ((N = get_argument (*argc, argv, "-cptlist"))) {
    2626    remove_argument (N, argc, argv);
    2727    *RegionList = strcreate (argv[N]);

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

    r3462 r4689  
    2121  zero = 17.0;
    2222  range = -5.0;
    23   if (N = get_argument (argc, argv, "-m")) {
     23  if ((N = get_argument (argc, argv, "-m"))) {
    2424    remove_argument (N, &argc, argv);
    2525    range = atof(argv[N]);

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

    r2598 r4689  
    99# define ASTRO_H
    1010
    11 /* why is nothing in here? */
     11void InitAstro ();
    1212
    1313# endif

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

    r2598 r4689  
    44
    55void cleanup ();
     6void InitBasic ();

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

    r3141 r4689  
    77# ifndef DATA_H
    88# define DATA_H
     9
     10void InitData ();
    911
    1012/* in misc/queues.c */

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

    r2598 r4689  
    55# include "display.h"
    66# include "sbig.h"
     7
     8void InitDIMM ();
    79
    810/* telescope.c */

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

    r4684 r4689  
    1 # include "opihi.h"
    21# include "data.h"
     2# include "basic.h"
     3# include "astro.h"
    34
    45# ifndef DVO1_H
    … …  
    6869RegionFile   *SelectRegions         PROTO((char *RegionName, char *RegionList, int *nregions));
    6970
     71void InitDVO ();
     72
     73void FreeImageSelection ();
     74Image *MatchImage (unsigned int time, short int source);
     75int GetRegionSelection ();
     76int SetRegionSelection (int *argc, char **argv, char **RegionName, char **RegionList);
     77void sort_image_subset (Image *image, int *subset, int N);
     78int match_image_subset (Image *image, int *subset, int Nsubset, unsigned int T, short int S);
     79int GetTimeSelection (time_t *tz, time_t *te);
     80
    7081# endif

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

    r3462 r4689  
    44# include <fcntl.h>
    55# include <sys/types.h>
     6# include <sys/wait.h>
    67# include <sys/socket.h>
    78# include <sys/un.h>

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

    r2598 r4689  
    44                                0.0, -7.5, -15.0, -22.5, -30.0, -37.5, -45.0,
    55                                -52.5, -60.0, -67.5, -75.0, -82.5, -90.0};
     6static char *Dec2Sections[] = {"n0000", "n0730", "n1500", "n2230", "n3000", "n3730", "n4500",
     7                               "n5230", "n6000", "n6730", "n7500", "n8230", "weirdness",
     8                               "s0000", "s0730", "s1500", "s2230", "s3000", "s3730", "s4500",
     9                               "s5230", "s6000", "s6730", "s7500", "s8230", "weirdness"};
     10
     11static int NDecLines[] = {593, 584, 551, 530, 522, 465, 406, 362, 280, 198, 123, 24,
     12                          0, 597, 578, 574, 577, 534, 499, 442, 376, 294, 212, 144, 48};
     13
     14/** older data layout concepts
    615static char *DecSections[] = {"N0000", "N0730", "N1500", "N2230", "N3000", "N3730", "N4500",
    716                              "N5230", "N6000", "N6730", "N7500", "N8230", "weirdness",
    817                              "S0000", "S0730", "S1500", "S2230", "S3000", "S3730", "S4500",
    918                              "S5230", "S6000", "S6730", "S7500", "S8230", "weirdness"};
    10 
    11 static char *Dec2Sections[] = {"n0000", "n0730", "n1500", "n2230", "n3000", "n3730", "n4500",
    12                                "n5230", "n6000", "n6730", "n7500", "n8230", "weirdness",
    13                                "s0000", "s0730", "s1500", "s2230", "s3000", "s3730", "s4500",
    14                                "s5230", "s6000", "s6730", "s7500", "s8230", "weirdness"};
    1519
    1620static char *disk[] = {"disk 1", "disk 1", "disk 1", "disk 1", "disk 1", "disk 1", "disk 1",
    … …  
    2125static int NBigRASections [] = {48, 47, 45, 43, 40, 36, 32, 28, 21, 15, 9, 3, 3, 48, 47, 45, 43, 40, 36, 32, 28, 21, 15, 9, 3, 3};
    2226
    23 static int NDecLines[] = {593, 584, 551, 530, 522, 465, 406, 362, 280, 198, 123, 24,
    24                           0, 597, 578, 574, 577, 534, 499, 442, 376, 294, 212, 144, 48};
     27**/

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

    r3144 r4689  
    99float (*fitfunc)(float, float, float *, int, float *);
    1010void (*imfit_cleanup)();
     11
     12void fgauss_setup (char *name);
     13void pgauss_setup (char *name);
     14void sgauss_setup (char *name);
     15void qgauss_setup (char *name);
     16void Pgauss_setup (char *name);
     17void Sgauss_setup (char *name);
     18void Qgauss_setup (char *name);
     19void qfgauss_setup (char *name);
     20void qrgauss_setup (char *name);

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

    r2843 r4689  
    11# include "data.h"
     2# include "basic.h"
     3# include "astro.h"
    24
    35# ifndef MANA_H
    46
     7void InitMana ();
    58int *findrowpeaks (float *row, int Nrow, float threshold, int *npeaks);
    69

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

    r4684 r4689  
    1 # include "opihi.h"
    2 # include <sys/types.h>
    3 # include <sys/wait.h>
     1# include "data.h"
     2# include "basic.h"
    43
    54/** pclient global data **/
    … …  
    7170void CheckChildStatus ();
    7271
     72void InitPclient ();
     73void gotsignal (int signum);
     74
    7375# define DTIME(A,B) ((A.tv_sec - B.tv_sec) + 1e-6*(A.tv_usec - B.tv_usec))

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

    r4684 r4689  
    1 # include "opihi.h"
    2 # include <sys/types.h>
    3 # include <sys/wait.h>
     1# include "data.h"
     2# include "basic.h"
    43
    54typedef struct timeval Ptime;
    … …  
    105104} Stack;
    106105
    107 /* these should be loaded from ConfigInit or from opihi variables */
    108 static char *CONNECT;  /* connection method (ssh, rsh, etc) */
    109 static char *PCLIENT;  /* shell on remote host (eg, pclient) */
     106/* XXX if this is hard-wired, we can't change shell name in StartHost */
    110107# define PCLIENT_PROMPT "pclient:"
    111108
    … …  
    118115int  FlushIOBuffer (IOBuffer *buffer);
    119116void FreeIOBuffer (IOBuffer *buffer);
     117
     118void InitPcontrol ();
    120119
    121120void *GetStack (Stack *stack, int where);
    … …  
    155154int rconnect (char *command, char *hostname, char *shell, int *stdio);
    156155int CheckHost (Host *host);
    157 char *memstr (char *m1, char *m2, int n);
    158156Stack *GetJobStack (int StackID);
    159157int PutJob (Job *job, int StackID, int where);
    … …  
    168166Host *UnlinkJobAndHost (Job *job);
    169167void LinkJobAndHost (Job *job, Host *host);
     168int StopHost (Host *host);
     169
     170int PrintJobStack (int Nstack);
     171int PrintHostStack (int Nstack);
     172void InitJobStacks ();
     173void InitHostStacks ();
     174void DownHost (Host *host);
     175void OffHost (Host *host);
     176int DownHosts ();
     177int VerboseMode ();
     178int StartJob (Job *job);

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

    r4684 r4689  
    1 # include "opihi.h"
    2 # include <sys/types.h>
    3 # include <sys/wait.h>
     1# include "data.h"
     2# include "basic.h"
    43
    54typedef enum {
    … …  
    111110/* scheduler prototypes */
    112111
     112void InitSched ();
     113
    113114char *memstr (char *m1, char *m2, int n);
    114115
    … …  
    157158int CheckLocalJobStatus (Job *job);
    158159void InitTaskTimers ();
    159 Function *FindControllerCommand (char *cmd);
     160CommandF *FindControllerCommand (char *cmd);
     161int QuitController ();
     162int VerboseMode ();
     163int KillLocalJob (Job *job);
     164int CheckControllerOutput ();
     165int PrintControllerOutput ();
     166
     167int InitIOBuffer (IOBuffer *buffer, int Nalloc);
     168int FlushIOBuffer (IOBuffer *buffer);
     169int ReadtoIOBuffer (IOBuffer *buffer, int fd);
     170void FreeIOBuffer (IOBuffer *buffer);
     171int KillControllerJob (Job *job);
     172int CheckControllerStatus ();

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

    r4462 r4689  
    11/*** shell.h ***/
     2# include "external.h"
    23
    34# ifndef SHELL_H
    … …  
    89# define ISNUM(c) (isdigit(c) || (c == '-') || (c == '.'))
    910
     11# define MACRO_STRING(s) #s
     12# define MACRO_NAME(s) MACRO_STRING(s)
     13
     14typedef int CommandF ();
     15
    1016/*** typedef structs used by shell functions ***/
    1117typedef struct {                        /* basic opihi command structure */
    1218  char     *name;
    13   Function *func;   
     19  CommandF *func;   
    1420  char     *help;
    1521} Command;
    … …  
    6773char         *GetMacroName              PROTO((void));
    6874int           GetMacroDepth             PROTO((void));
     75void          ListMacro                 PROTO((Macro *macro));
     76void          ListMacros                PROTO(());
     77void          FreeMacro                 PROTO((Macro *macro));
    6978
    7079int           exec_loop                 PROTO((Macro *loop));
    … …  
    104113int           macro_write               PROTO((int, char **));
    105114
     115char *memstr (char *m1, char *m2, int n);
     116
    106117# endif

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

    r3692 r4689  
    44
    55int PrepPlotting (int Npts, Graphdata *graphmode) {
    6 
    7   char buffer[128], buffer2[128];
    86
    97  if (!GetGraph (NULL, &Xgraph, NULL)) return (FALSE);

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

    r4602 r4689  
    311311  p1 = line;
    312312  tmp = strtod (p1, &p2);
     313  mode = TIME_DATE;
    313314  if (p2 == p1 + strlen (p1) - 1) {
    314315    if (*p2 == 'j') {
    … …  
    330331      mode = TIME_SECONDS;
    331332    }
    332   } else {
    333     mode = TIME_DATE;
    334333  }
    335334  return (mode);

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

    r3693 r4689  
    4343void ApplyLimits (int Xgraph, Graphdata *graphmode, int apply) {
    4444
    45   char buffer[128], buffer2[65];
    46 
    4745  if (!apply) return;
    4846

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

    r2938 r4689  
    6464                float (funcs)(float, float, float *, int, float *)) {
    6565
    66   int k, j, i;
    67   float ydiff, wt, chisq;
     66  int i;
     67  float ydiff, chisq;
    6868
    6969  chisq = 0.0;

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

    r3895 r4689  
    245245int SendLabel (char *string, int Xgraph, int mode) {
    246246
    247   char buffer[64];
    248 
    249247  SendGraphCommand (Xgraph, 4, "LABL");
    250248  SendGraphCommand (Xgraph, 16, "%6d %6d", strlen (string), mode);
    … …  
    257255
    258256  int Nbyte, status;
    259   char *string, tmp;
     257  char tmp;
    260258  va_list argp; 
    261259
    … …  
    286284int SendGraphCommandV (int device, int length, char *format, va_list argp) {
    287285
    288   int Nbyte;
    289   char *string, tmp[4];
     286  char *string;
    290287
    291288  /* I allocated and zero 1 extra byte */

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

    r2598 r4689  
    2121  if (Ny < Nx) return (0);
    2222
     23  l = nm = 0;
    2324  ALLOCATE (rv1, float, Nx);
    2425  for (i = 0; i < Nx; i++) {

  • trunk/Ohana/src/opihi/lib.shell/Makefile

    r3525 r4689  
    4040$(SDIR)/macro_read.$(ARCH).o            \
    4141$(SDIR)/macro_write.$(ARCH).o           \
     42$(SDIR)/memstr.$(ARCH).o                \
    4243$(SDIR)/multicommand.$(ARCH).o          \
    4344$(SDIR)/parse.$(ARCH).o                 \

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

    r3414 r4689  
    33int check_stack (StackVar *stack, int Nstack, int validsize) {
    44
    5   double tmp;
    65  int i, Nx, Ny, Nv, size;
    76  char *c;
    87
    9   Nv = Nx = -1;
     8  Nv = Nx = Ny = -1;
    109
    1110  for (i = 0; i < Nstack; i++) {

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

    r3901 r4689  
    1212  Vector *vec;
    1313
     14  buf = NULL;
     15  vec = NULL;
    1416  ALLOCATE (outname, char, 256);
    1517

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

    r4306 r4689  
    1717  Nout = Nvar = 0;
    1818
     19  status = TRUE;
    1920  init_stack (&tmp_stack);
    2021

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

    r4462 r4689  
    1111  p = line;
    1212  done = FALSE;
     13  status = TRUE;
    1314  while (!done) {
    1415    q = strchr (p, ';');

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

    r4462 r4689  
    44int main (int argc, char **argv) {
    55
    6   int i, Nbad, Nlist, status;
    7   char **list, *line, *outline, *prompt, *history;
     6  int Nbad, status;
     7  char *line, *prompt, *history;
    88  pid_t ppid;
    99

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

    r3418 r4689  
    3535  }
    3636 
    37   /* keep these?
    38      set_int_variable ("UNSIGN", 0);
    39      FT_UNSIGN_MODE = FALSE;
    40   */
    41 
    4237  {
    4338   
    … …  
    5752    set_str_variable ("KAPA", "kapa");
    5853
    59 # if 0   
    60     help = getenv ("MANA-HELP");
    61     if (help == (char *) NULL) {
    62       /* try in exec path */
    63       ALLOCATE (help, char, 1024);
    64       execdir = findexec (argc, argv);
    65       if (execdir == (char *) NULL) {
    66         fprintf (stderr, "error with executable name: can't resolve path\n");
    67         execdir = strcreate (".");
    68       }
    69       execname = filebasename (argv[0]);
    70       sprintf (help, "%s/%s.hlp", execdir, execname);
    71     }
    72     set_str_variable ("HELPDIR", help);
    73 # endif
     54  /* keep these?
     55     set_int_variable ("UNSIGN", 0);
     56     FT_UNSIGN_MODE = FALSE;
     57  */
    7458
    7559    if (!ConfigInit (&argc, argv)) {

  • trunk/Ohana/src/opihi/mana/Makefile

    r3525 r4689  
    77LIB     =       $(HOME)/lib
    88INC     =       $(HOME)/include
    9 HELP    =       $(HOME)/help
    109SDIR    =       $(HOME)/mana
    1110#
    … …  
    1413DESTINC =       $(LINC)
    1514DESTMAN =       $(LMAN)
     15DESTHLP =       $(LHLP)/mana
    1616# 
    1717INCS    =       -I$(INC) -I$(LINC) -I$(XINC)
    … …  
    2020LIBS2   =       -lbasiccmd -ldatacmd -lastrocmd -lshell -ldata
    2121LIBS    =       $(LIBS2) $(LIBS1)
    22 CFLAGS  =       $(INCS)
     22CFLAGS  =       $(INCS) -DHELPDIR_DEFAULT=$(DESTHLP)
    2323CCFLAGS =       $(LIBS)
    2424
    … …  
    5252$(BIN)/mana.$(ARCH) : $(mana) $(libs)
    5353
    54 install: $(DESTBIN)/mana
     54install: $(DESTBIN)/mana help
    5555
    56 # these need to have a better home
    57 # $(SDIR)/demux.$(ARCH).o                       \
    58 # $(SDIR)/elixir.$(ARCH).o              \
    59 # $(SDIR)/adc.$(ARCH).o                 \
    60 # $(SDIR)/focus.$(ARCH).o                       \
    61 # $(SDIR)/simsignal.$(ARCH).o           \
     56help: cmd.basic.help cmd.data.help cmd.astro.help mana.help
    6257
    6358# utilities #################################################
    … …  
    112107        $(CC) $(CFLAGS) -c $*.c -o $@
    113108
    114 
    115 
    116 ## -*- makefile -*-
    117 # deprecated functions: verify & delete
    118 #$(SDIR)/abszero.$(ARCH).o \
    119 #$(SDIR)/cals.$(ARCH).o \
    120 #$(SDIR)/dumpmags.$(ARCH).o \
    121 #$(SDIR)/extract.$(ARCH).o \
    122 #$(SDIR)/gtypes.$(ARCH).o \
    123 #$(SDIR)/photresid.$(ARCH).o \
    124 #$(SDIR)/resid.$(ARCH).o \
    125 #$(SDIR)/zeropts.$(ARCH).o
    126 #$(SDIR)/objload.$(ARCH).o \ - make sure we have vect to tv
    127 #$(SDIR)/ccdextract.$(ARCH).o \
    128 #$(SDIR)/cmdextract.$(ARCH).o \
    129 #$(SDIR)/dmagextract.$(ARCH).o \
    130 #$(SDIR)/ddmagextract.$(ARCH).o \
    131 
    132 # future functions, not fully implemented
    133 #$(SDIR)/detrend.$(ARCH).o \
    134 #$(SDIR)/getxtra.$(ARCH).o \
    135 #$(SDIR)/addxtra.$(ARCH).o \
    136 
    137 # functions that need to be updated
    138 #$(SDIR)/gregions.$(ARCH).o \
    139 
     109%.help:
     110        @if [ ! -d $(DESTHLP) ]; then mkdir -p $(DESTHLP); fi
     111        rm -f $(HOME)/$*/help/*~
     112        rm -f $(HOME)/$*/help/#*
     113        cp $(HOME)/$*/help/* $(DESTHLP)/

  • trunk/Ohana/src/opihi/mana/fitcontour.c

    r3105 r4689  
    66  int i;
    77  double **C, **B;
    8   float cs1, sn1, cs, sn, x, y, r, xo, yo, t;
     8  float cs1, sn1, cs, sn, x, y, r, xo, yo;
    99  float dR, Rmin, Rmaj, Theta, Rx, Ry, Rxy, R1, R2, R3;
    1010  Vector *vecx, *vecy;

  • trunk/Ohana/src/opihi/mana/mana.c

    r2826 r4689  
    1 # include "opihi.h"
     1# include "mana.h"
    22
    33# define opihi_name "MANA"
    … …  
    77# define opihi_rcfile ".manarc"
    88
    9 void InitBasic ();
    10 void InitData ();
    11 void InitAstro ();
    12 void InitMana ();
    13 
    14 void welcome () {
    15   fprintf (stderr, "\n");
    16   fprintf (stderr, "Welcome to %s - %s\n\n", opihi_name, opihi_description);
    17 }
    18 
    199/* program-dependent initialization */
    2010void initialize (int argc, char **argv) {
    2111 
    22   FILE *f;
    23 
    2412  auto_break = TRUE;
    2513
    … …  
    4230  InitBasic ();
    4331  InitData ();
     32  InitOutfile ();
    4433  InitAstro ();
    45   InitOutfile ();
    4634  InitMana ();
    4735
    … …  
    5240  set_str_variable ("PROMPT", opihi_prompt);
    5341  set_str_variable ("RCFILE", opihi_rcfile);
     42# ifdef HELPDIR_DEFAULT
     43  set_str_variable ("HELPDIR", MACRO_NAME(HELPDIR_DEFAULT));
     44# endif
    5445
    55   /* here we open the history file for append.  it this fails, we
    56      won't be able to write to it, warn the user.  otherwise, this
    57      creates the file readline will write to, if it did not exist */ 
    58 
    59   /* check history file */
    60   /* rewrite with fstat or stat */
    61   f = fopen (opihi_history, "a");
    62   if (f == NULL) /* no current history file here */
    63     fprintf (stderr, "can't save history.\n");
    64   else
    65     fclose (f);
    66  
    67   stifle_history (200);
    68   read_history (opihi_history);
     46  { /* check history file permission */
     47    FILE *f;
     48    f = fopen (opihi_history, "a");
     49    if (f == NULL) /* no current history file here */
     50      fprintf (stderr, "can't save history.\n");
     51    else
     52      fclose (f);
     53    stifle_history (200);
     54    read_history (opihi_history);
     55  }
    6956
    7057  signal (SIGINT, SIG_IGN);
    … …  
    7259}
    7360
     61/* standard welcome message */
     62void welcome () {
     63  fprintf (stderr, "\n");
     64  fprintf (stderr, "Welcome to %s - %s\n\n", opihi_name, opihi_description);
     65}
     66
    7467/* add program-dependent exit functions here */
    7568void cleanup () {
    76   /* -libdisplay */
    7769  QuitImage ();
    7870  QuitGraph ();

  • trunk/Ohana/src/opihi/mana/starcontour.c

    r3030 r4689  
    3030
    3131  /* find transition below (limit range?) */
     32  xmin = xmax = 0;
    3233  xs = xp;
    3334  for (y = yp; (y >= 0) && (v[xs + y*Nx] > zo); y--) {

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

    r4684 r4689  
    44
    55  Job *job;
    6   Task *task;
    76  Macro *macro;
    8   int i, found, status;
    9   int Ntest;
     7  int i, status;
    108
    119  /** test all jobs: ready to test?  finished? **/

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

    r4573 r4689  
    66  CheckJobs ();
    77  CheckControllerOutput ();
    8 
     8  return (TRUE);
    99}

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

    r4684 r4689  
    55  Job *job;
    66  Task *task;
    7   Macro *macro;
    8   int i, found, status;
    9   int Ntest;
     7  int status;
    108
    119  /** test all tasks: ready to test? ready to run? **/

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

    r4684 r4689  
    2020    GetJobOutput ("stderr", job[0].pid, &job[0].stderr, job[0].stderr_size);
    2121  } 
     22  return (TRUE);
    2223}
    2324
    … …  
    157158  /* construct the controller command portion */
    158159  if (!strcmp (job[0].task[0].host, "NONE")) {
    159     sprintf (cmd, "job", cmd);
     160    sprintf (cmd, "job");
    160161  } else {
    161162    if (job[0].task[0].host_required) {
    … …  
    391392  IOBuffer buffer;
    392393
     394  if (!CheckControllerStatus()) return (TRUE);
     395
    393396  sprintf (cmd, "kill %d", job[0].pid);
    394397  InitIOBuffer (&buffer, 0x100);
    … …  
    400403}
    401404
     405int QuitController () {
     406
     407  int status;
     408  char cmd[128];
     409  IOBuffer buffer;
     410
     411  if (!CheckControllerStatus()) return (TRUE);
     412
     413  sprintf (cmd, "quit");
     414  InitIOBuffer (&buffer, 0x100);
     415  status = ControllerCommand (cmd, CONTROLLER_PROMPT, &buffer);
     416  return (TRUE);
     417}
     418
    402419/* memstr returns a view, not an allocated string : don't free */

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

    r4450 r4689  
    5959    }
    6060  }
     61  return (Nread);
    6162}
    6263

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

    r4684 r4689  
    3838
    3939  JobIDList[JobID] = FALSE;
     40  return (TRUE);
    4041}

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

    r4684 r4689  
    5656
    5757  for (i = 0; i < Njobs; i++) {
    58     fprintf (stderr, "%d: %-15s %5d %20s (%x)\n", Njobs, jobs[i][0].task[0].name, jobs[i][0].JobID, jobs[i][0].argv[0], jobs[i][0].argv);
     58    fprintf (stderr, "%d: %-15s %5d %20s (%lx)\n", Njobs, jobs[i][0].task[0].name, jobs[i][0].JobID, jobs[i][0].argv[0], (long) jobs[i][0].argv);
    5959  }
    6060  return;

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

    r4684 r4689  
    152152      }
    153153  }
    154   return;
     154  return (FALSE);
    155155}
    156156

  • trunk/Ohana/src/opihi/pantasks/Makefile

    r4686 r4689  
    77LIB     =       $(HOME)/lib
    88INC     =       $(HOME)/include
    9 HELP    =       $(HOME)/help
    109SDIR    =       $(HOME)/sched
    1110#
    … …  
    3837$(SDIR)/JobIDOps.$(ARCH).o \
    3938$(SDIR)/TaskOps.$(ARCH).o \
    40 $(SDIR)/IOBufferOps.$(ARCH).o \
    41 $(SDIR)/memstr.$(ARCH).o
     39$(SDIR)/IOBufferOps.$(ARCH).o
    4240
    4341cmds = \
    … …  
    5048$(SDIR)/controller.$(ARCH).o \
    5149$(SDIR)/controller_host.$(ARCH).o \
     50$(SDIR)/controller_exit.$(ARCH).o \
    5251$(SDIR)/controller_check.$(ARCH).o \
    5352$(SDIR)/controller_status.$(ARCH).o \
    … …  
    107106        cp $^ $@
    108107
    109 %.help:
    110         @if [ ! -d $(DESTHLP) ]; then mkdir -p $(DESTHLP); fi
    111         rm -f $(HOME)/$*/help/*~
    112         rm -f $(HOME)/$*/help/#*
    113         cp $(HOME)/$*/help/* $(DESTHLP)/
    114 
    115108clean:
    116109        rm -f $(BIN)/*.$(ARCH)
    … …  
    136129        $(CC) $(CFLAGS) -c $*.c -o $@
    137130
    138 
    139 
    140 ## -*- makefile -*-
    141 # deprecated functions: verify & delete
    142 #$(SDIR)/abszero.$(ARCH).o \
    143 #$(SDIR)/cals.$(ARCH).o \
    144 #$(SDIR)/dumpmags.$(ARCH).o \
    145 #$(SDIR)/extract.$(ARCH).o \
    146 #$(SDIR)/gtypes.$(ARCH).o \
    147 #$(SDIR)/photresid.$(ARCH).o \
    148 #$(SDIR)/resid.$(ARCH).o \
    149 #$(SDIR)/zeropts.$(ARCH).o
    150 #$(SDIR)/objload.$(ARCH).o \ - make sure we have vect to tv
    151 #$(SDIR)/ccdextract.$(ARCH).o \
    152 #$(SDIR)/cmdextract.$(ARCH).o \
    153 #$(SDIR)/dmagextract.$(ARCH).o \
    154 #$(SDIR)/ddmagextract.$(ARCH).o \
    155 
    156 # future functions, not fully implemented
    157 #$(SDIR)/detrend.$(ARCH).o \
    158 #$(SDIR)/getxtra.$(ARCH).o \
    159 #$(SDIR)/addxtra.$(ARCH).o \
    160 
    161 # functions that need to be updated
    162 #$(SDIR)/gregions.$(ARCH).o \
    163 
     131%.help:
     132        @if [ ! -d $(DESTHLP) ]; then mkdir -p $(DESTHLP); fi
     133        rm -f $(HOME)/$*/help/*~
     134        rm -f $(HOME)/$*/help/#*
     135        cp $(HOME)/$*/help/* $(DESTHLP)/

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

    r4573 r4689  
    22
    33int controller_host    PROTO((int, char **));
     4int controller_exit    PROTO((int, char **));
    45int controller_status  PROTO((int, char **));
    56int controller_check   PROTO((int, char **));
    … …  
    78
    89static Command controller_cmds[] = {
     10  {"exit",   controller_exit,   "shutdown controller"},
    911  {"host",   controller_host,   "define host for controller"},
    1012  {"check",  controller_check,  "check controller host/job"},
    … …  
    1618
    1719  int status;
    18   Function *func;
     20  CommandF *func;
    1921
    2022  if (argc < 2) {
    … …  
    3335}
    3436
    35 Function *FindControllerCommand (char *cmd) {
     37CommandF *FindControllerCommand (char *cmd) {
    3638
    3739  int i, N;

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

    r4573 r4689  
    22
    33int controller_output (int argc, char **argv) {
    4 
    5   int status;
    6   char command[1024];
    7   IOBuffer buffer;
    84
    95  if (argc != 1) {

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

    r4552 r4689  
    33int delete_job (int argc, char **argv) {
    44
    5   Job *job;
    6   int JobID, N;
     5  int JobID;
    76
    87  if (argc < 2) {

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

    r4684 r4689  
    44
    55  Job *job;
    6   int JobID, N;
     6  int JobID;
    77
    88  if (argc < 2) {

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

    r4686 r4689  
    77# define opihi_rcfile ".schedrc"
    88
    9 void InitBasic ();
    10 void InitData ();
    11 void InitSched ();
    12 
    13 void welcome () {
    14   fprintf (stderr, "\n");
    15   fprintf (stderr, "Welcome to %s - %s\n\n", opihi_name, opihi_description);
    16 }
    17 
    189/* program-dependent initialization */
    1910void initialize (int argc, char **argv) {
    2011 
    21   FILE *f;
    22 
    2312  auto_break = TRUE;
    2413
    … …  
    5544  set_str_variable ("PROMPT", opihi_prompt);
    5645  set_str_variable ("RCFILE", opihi_rcfile);
    57 # define xstr(s) str(s)
    58 # define str(s) #s
    5946# ifdef HELPDIR_DEFAULT
    60   set_str_variable ("HELPDIR", xstr(HELPDIR_DEFAULT));
     47  set_str_variable ("HELPDIR", MACRO_NAME(HELPDIR_DEFAULT));
    6148# endif
    6249
    63   /* here we open the history file for append.  it this fails, we
    64      won't be able to write to it, warn the user.  otherwise, this
    65      creates the file readline will write to, if it did not exist */ 
    66 
    67   /* check history file */
    68   /* rewrite with fstat or stat */
    69   f = fopen (opihi_history, "a");
    70   if (f == NULL) /* no current history file here */
    71     fprintf (stderr, "can't save history.\n");
    72   else
    73     fclose (f);
    74  
    75   stifle_history (200);
    76   read_history (opihi_history);
     50  { /* check history file permission */
     51    FILE *f;
     52    f = fopen (opihi_history, "a");
     53    if (f == NULL) /* no current history file here */
     54      fprintf (stderr, "can't save history.\n");
     55    else
     56      fclose (f);
     57    stifle_history (200);
     58    read_history (opihi_history);
     59  }
    7760
    7861  signal (SIGINT, SIG_IGN);
    … …  
    8063}
    8164
     65/* standard welcome message */
     66void welcome () {
     67  fprintf (stderr, "\n");
     68  fprintf (stderr, "Welcome to %s - %s\n\n", opihi_name, opihi_description);
     69}
     70
    8271/* add program-dependent exit functions here */
    8372void cleanup () {
    84   /* -libdisplay
    8573  QuitImage ();
    86   QuitGraph (); */
     74  QuitGraph ();
     75  QuitController ();
    8776  return;
    8877}

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

    r4684 r4689  
    1010  ListTasks (FALSE);
    1111  ListJobs ();
    12 
     12  return (TRUE);
    1313}
    1414

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

    r4684 r4689  
    99  int ThisList, status;
    1010  char *input, *outline;
    11   Macro *macro;
    1211  Task *task;
    1312
    14   if (N = get_argument (argc, argv, "-list")) {
     13  if ((N = get_argument (argc, argv, "-list"))) {
    1514    remove_argument (N, &argc, argv);
    1615    ListTasks (FALSE);
    … …  
    1817  }
    1918
    20   if (N = get_argument (argc, argv, "-longlist")) {
     19  if ((N = get_argument (argc, argv, "-longlist"))) {
    2120    remove_argument (N, &argc, argv);
    2221    ListTasks (TRUE);
    … …  
    2423  }
    2524
    26   if (N = get_argument (argc, argv, "-show")) {
     25  if ((N = get_argument (argc, argv, "-show"))) {
    2726    remove_argument (N, &argc, argv);
    2827    ShowTask (argv[N]);

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

    r4684 r4689  
    55  int N, RequiredHost;
    66  Task *task;
    7   char *taskname;
    87
    98  RequiredHost = FALSE;
    10   if (N = get_argument (argc, argv, "-required")) {
     9  if ((N = get_argument (argc, argv, "-required"))) {
    1110    remove_argument (N, &argc, argv);
    1211    RequiredHost = TRUE;

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

    r4684 r4689  
    2727    return (FALSE);
    2828  }
     29
     30  macro = NULL;
    2931
    3032  /*** identify which Macro in Task this particular macro goes with ***/

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

    r4684 r4689  
    77  Task *task;
    88
     9  PollValue = 0;
    910  Poll = FALSE;
    10   if (N = get_argument (argc, argv, "-poll")) {
     11  if ((N = get_argument (argc, argv, "-poll"))) {
    1112    Poll = TRUE;
    1213    remove_argument (N, &argc, argv);
    … …  
    1516  }
    1617
     18  ExecValue = 0;
    1719  Exec = FALSE;
    18   if (N = get_argument (argc, argv, "-exec")) {
     20  if ((N = get_argument (argc, argv, "-exec"))) {
    1921    Exec = TRUE;
    2022    remove_argument (N, &argc, argv);
    … …  
    2325  }
    2426
     27  TimeoutValue = 0;
    2528  Timeout = FALSE;
    26   if (N = get_argument (argc, argv, "-timeout")) {
     29  if ((N = get_argument (argc, argv, "-timeout"))) {
    2730    Timeout = TRUE;
    2831    remove_argument (N, &argc, argv);
    … …  
    4952  return (TRUE);
    5053}
    51 
    52 
    53 /**
    54     careful with this: the command is supposed to be realized
    55     for the Job, not the Task (at execution)
    56     the code is right, but who calls it when needs to be clarified.
    57  **/
    58 

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

    r4684 r4689  
    33int task_trange (int argc, char **argv) {
    44
    5   int N, RequiredHost;
     5  int N;
    66  Task *task;
    77  TimeRange range;
    … …  
    1616     keep = false means the time range defines an invalid range */
    1717  range.keep = TRUE;
    18   if (N = get_argument (argc, argv, "-exclude")) {
     18  if ((N = get_argument (argc, argv, "-exclude"))) {
    1919    remove_argument (N, &argc, argv);
    2020    range.keep = FALSE;

  • trunk/Ohana/src/opihi/pclient/ChildOps.c

    r4450 r4689  
    7272      break;
    7373  }
    74 
     74  return (TRUE);
    7575}
    7676

  • trunk/Ohana/src/opihi/pclient/IOBufferOps.c

    r3187 r4689  
    5757    }
    5858  }
     59  return (Nread);
    5960}
    6061

  • trunk/Ohana/src/opihi/pclient/Makefile

    r3525 r4689  
    77LIB     =       $(HOME)/lib
    88INC     =       $(HOME)/include
    9 HELP    =       $(HOME)/help
    109SDIR    =       $(HOME)/pclient
    1110#
    … …  
    1413DESTINC =       $(LINC)
    1514DESTMAN =       $(LMAN)
     15DESTHLP =       $(LHLP)/pclient
    1616# 
    1717INCS    =       -I$(INC) -I$(LINC) -I$(XINC)
    1818LFLAGS  =       -L$(LLIB) -L$(LIB)
    1919LIBS1   =       -lFITS -lsocket -lnsl -lreadline -ltermcap -lohana -lm
    20 LIBS2   =       -lbasiccmd -lshell -ldata
     20LIBS2   =       -lbasiccmd -ldatacmd -lshell -ldata
    2121LIBS    =       $(LIBS2) $(LIBS1)
    2222CFLAGS  =       $(INCS)
    … …  
    4242libs = \
    4343$(DESTLIB)/libbasiccmd.a \
     44$(DESTLIB)/libdatacmd.a \
    4445$(DESTLIB)/libshell.a \
    4546$(DESTLIB)/libdata.a
    … …  
    5253$(BIN)/pclient.$(ARCH) : $(pclient) $(libs)
    5354
    54 install: $(DESTBIN)/pclient
     55install: $(DESTBIN)/pclient help
     56
     57help: cmd.basic.help pclient.help
    5558
    5659# utilities #################################################
    … …  
    104107%.$(ARCH).o : %.c
    105108        $(CC) $(CFLAGS) -c $*.c -o $@
     109
     110%.help:
     111        @if [ ! -d $(DESTHLP) ]; then mkdir -p $(DESTHLP); fi
     112        rm -f $(HOME)/$*/help/*~
     113        rm -f $(HOME)/$*/help/#*
     114        cp $(HOME)/$*/help/* $(DESTHLP)/

  • trunk/Ohana/src/opihi/pclient/pclient.c

    r3211 r4689  
    77# define opihi_rcfile ".pcontrolrc"
    88
    9 void InitPclient ();
    10 void InitBasic ();
    11 
    12 void welcome () {
    13   fprintf (stderr, "\n");
    14   fprintf (stderr, "Welcome to %s - %s\n\n", opihi_name, opihi_description);
    15 }
    16 
    17 void gotsignal (int signum) {
    18   fprintf (stderr, "got signal : %d\n", signum);
    19   return;
    20 }
    21 
    229/* program-dependent initialization */
    2310void initialize (int argc, char **argv) {
    2411 
    25   FILE *f;
    26 
    2712  auto_break = TRUE;
    2813
    … …  
    4429  /* load the commands used by this implementation */
    4530  InitBasic ();
     31  InitData ();
    4632  InitOutfile ();
    4733  InitPclient ();
    … …  
    5541  set_str_variable ("PROMPT", opihi_prompt);
    5642  set_str_variable ("RCFILE", opihi_rcfile);
     43# ifdef HELPDIR_DEFAULT
     44  set_str_variable ("HELPDIR", MACRO_NAME(HELPDIR_DEFAULT));
     45# endif
    5746
    5847  /* ignore the history file.  to change this, see, eg, mana.c */
    … …  
    6453}
    6554
     55/* standard welcome message */
     56void welcome () {
     57  fprintf (stderr, "\n");
     58  fprintf (stderr, "Welcome to %s - %s\n\n", opihi_name, opihi_description);
     59}
     60
    6661/* add program-dependent exit functions here */
    6762void cleanup () {
    6863  return;
    6964}
     65
     66void gotsignal (int signum) {
     67  fprintf (stderr, "got signal : %d\n", signum);
     68  return;
     69}
     70

  • trunk/Ohana/src/opihi/pclient/reset.c

    r4450 r4689  
    3737
    3838    /* total failure, don't reset */
    39     fprintf (stderr, "child process %d is hung, cannot reset\n");
     39    fprintf (stderr, "child process %d is hung, cannot reset\n", ChildPID);
    4040    fprintf (stdout, "STATUS 0\n");
    4141    return (FALSE);

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

    r4575 r4689  
    22
    33int CheckBusyJob (Job *job) {
    4  
    5   int      i;
     4
    65  int      status;
    76  int      outstate;

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

    r4575 r4689  
    33int CheckHost (Host *host) {
    44 
    5   int i, N, status;
     5  int N, status;
    66  IOBuffer buffer;
    77  Job *job;

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

    r4450 r4689  
    4545    return (TRUE);
    4646  }
     47  return (TRUE);
    4748}
    4849

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

    r3212 r4689  
    1212  CheckLiveHosts();
    1313
    14   /* status (0, NULL); */
     14  return (TRUE);
    1515}
    1616
    … …  
    2828    CheckBusyJob (job);
    2929  }
     30  return (TRUE);
    3031}
    3132
    … …  
    4344    CheckDoneJob (job);
    4445  }
     46  return (TRUE);
    4547}
    4648
    … …  
    5860    CheckDoneHost (host);
    5961  }
     62  return (TRUE);
    6063}
    6164
    … …  
    8285    CheckHost (host);
    8386  }
     87  return (TRUE);
    8488}
    8589
    … …  
    97101    StartHost (host);
    98102  }
     103  return (TRUE);
    99104}
    100105
    … …  
    107112  /* check if there are any pending jobs, otherwise skip step */
    108113  stack = GetJobStack (PCONTROL_JOB_PENDING);
    109   if (!stack[0].Nobject) return;
     114  if (!stack[0].Nobject) return (TRUE);
    110115
    111116  stack = GetHostStack (PCONTROL_HOST_IDLE);
    … …  
    116121    CheckIdleHost (host);
    117122  }
     123  return (TRUE);
    118124}

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

    r3204 r4689  
    5959    }
    6060  }
     61  return (Nread);
    6162}
    6263

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

    r4450 r4689  
    183183Host *UnlinkJobAndHost (Job *job) {
    184184
    185   int N;
    186185  Host *host;
    187186
    … …  
    205204
    206205void LinkJobAndHost (Job *job, Host *host) {
    207   int N;
    208206
    209207  job[0].host = (struct Host *) host;

  • trunk/Ohana/src/opihi/pcontrol/Makefile

    r4575 r4689  
    77LIB     =       $(HOME)/lib
    88INC     =       $(HOME)/include
    9 HELP    =       $(HOME)/help
    109SDIR    =       $(HOME)/pcontrol
    1110#
    … …  
    1413DESTINC =       $(LINC)
    1514DESTMAN =       $(LMAN)
     15DESTHLP =       $(LHLP)/pcontrol
    1616# 
    1717INCS    =       -I$(INC) -I$(LINC) -I$(XINC)
    1818LFLAGS  =       -L$(LLIB) -L$(LIB)
    1919LIBS1   =       -lFITS -lsocket -lnsl -lreadline -ltermcap -lohana -lm
    20 LIBS2   =       -lbasiccmd -lshell -ldata
     20LIBS2   =       -lbasiccmd -ldatacmd -lshell -ldata
    2121LIBS    =       $(LIBS2) $(LIBS1)
    22 CFLAGS  =       $(INCS) -Werror
     22CFLAGS  =       $(INCS) -DHELPDIR_DEFAULT=$(DESTHLP)
    2323CCFLAGS =       $(LIBS)
    2424
    … …  
    3030$(SDIR)/pcontrol.$(ARCH).o \
    3131$(SDIR)/rconnect.$(ARCH).o \
    32 $(SDIR)/memstr.$(ARCH).o \
    3332$(SDIR)/CheckBusyJob.$(ARCH).o \
    3433$(SDIR)/CheckDoneHost.$(ARCH).o \
    … …  
    6362libs = \
    6463$(DESTLIB)/libbasiccmd.a \
     64$(DESTLIB)/libdatamd.a \
    6565$(DESTLIB)/libshell.a \
    6666$(DESTLIB)/libdata.a
    … …  
    7373$(BIN)/pcontrol.$(ARCH) : $(pcontrol) $(libs)
    7474
    75 install: $(DESTBIN)/pcontrol
     75install: $(DESTBIN)/pcontrol help
     76
     77help: cmd.basic.help cmd.data.help pcontrol.help
    7678
    7779# utilities #################################################
    … …  
    125127%.$(ARCH).o : %.c
    126128        $(CC) $(CFLAGS) -c $*.c -o $@
     129
     130%.help:
     131        @if [ ! -d $(DESTHLP) ]; then mkdir -p $(DESTHLP); fi
     132        rm -f $(HOME)/$*/help/*~
     133        rm -f $(HOME)/$*/help/#*
     134        cp $(HOME)/$*/help/* $(DESTHLP)/

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

    r4575 r4689  
    99  /* pid = rconnect (CONNECT, host[0].hostname, PCLIENT, stdio); */
    1010
     11  /* perhaps change the name of these config variables... */
    1112  if (VarConfig ("COMMAND", "%s", command) == NULL) strcpy (command, "ssh");
    1213  if (VarConfig ("SHELL", "%s", shell)     == NULL) strcpy (shell, "pclient");

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

    r4450 r4689  
    2424    DownHost (host);
    2525  }
     26  return (TRUE);
    2627}
    2728
    … …  
    3132  int       waitstatus;
    3233  int       status;
    33   char     *p;
    3434  IOBuffer  buffer;
    3535

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

    r4573 r4689  
    11# include "pcontrol.h"
     2
    23char jobstate[6][32] = {"PENDING", "BUSY", "EXIT", "CRASH", "HUNG", "DONE"};
    34char hoststate[5][32] = {"IDLE", "BUSY", "DOWN", "DONE", "OFF"};
    … …  
    78  Job *job;
    89  Host *host;
    9   int JobID, HostID, N;
     10  int JobID, HostID;
    1011
    1112  if (argc != 3) {

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

    r4684 r4689  
    44
    55  Job *job;
    6   int JobID, N;
     6  int JobID;
    77
    88  if (argc < 2) {

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

    r4573 r4689  
    149149
    150150  HostID = AddHost (argv[1]);
    151   fprintf (stdout, "HostID: %d\n", HostID);
     151  fprintf (stdout, "HostID: %d\n", (int) HostID);
    152152  return (TRUE);
    153153}

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

    r4575 r4689  
    1 # include "opihi.h"
     1# include "pcontrol.h"
    22
    33int kill_pc     PROTO((int, char **));

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

    r4450 r4689  
    4848
    4949  JobID = AddJob (Host, Mode, Timeout, targc, targv);
    50   fprintf (stdout, "JobID: %d\n", JobID);
     50  fprintf (stdout, "JobID: %d\n", (int) JobID);
    5151  return (TRUE);
    5252}

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

    r4684 r4689  
    44
    55  Job *job;
    6   int JobID, N;
     6  int JobID;
    77
    88  if (argc < 2) {

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

    r4450 r4689  
    77# define opihi_rcfile ".pcontrolrc"
    88
    9 void InitPcontrol ();
    10 void InitBasic ();
    11 
    12 void welcome () {
    13   fprintf (stderr, "\n");
    14   fprintf (stderr, "Welcome to %s - %s\n\n", opihi_name, opihi_description);
    15 }
    16 
    179/* program-dependent initialization */
    1810void initialize (int argc, char **argv) {
    1911 
    20   FILE *f;
    21 
    2212  auto_break = TRUE;
    2313
    … …  
    3929  /* load the commands used by this implementation */
    4030  InitBasic ();
     31  InitData ();
    4132  InitOutfile ();
    4233  InitPcontrol ();
    … …  
    5041  set_str_variable ("PROMPT", opihi_prompt);
    5142  set_str_variable ("RCFILE", opihi_rcfile);
     43# ifdef HELPDIR_DEFAULT
     44  set_str_variable ("HELPDIR", MACRO_NAME(HELPDIR_DEFAULT));
     45# endif
    5246
    5347  /* ignore the history file.  to change this, see, eg, mana.c */
    5448  signal (SIGINT, SIG_IGN);
    5549  return;
     50}
     51
     52/* standard welcome message */
     53void welcome () {
     54  fprintf (stderr, "\n");
     55  fprintf (stderr, "Welcome to %s - %s\n\n", opihi_name, opihi_description);
    5656}
    5757

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

    r4575 r4689  
    11# include "pcontrol.h"
     2
    23# define CONNECT_TIMEOUT 300
    34

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

    r4573 r4689  
    11# include "pcontrol.h"
     2
    23char jobname[6][32] = {"PENDING", "BUSY", "EXIT", "CRASH", "HUNG", "DONE"};
    34char hostname[5][32] = {"IDLE", "BUSY", "DOWN", "DONE", "OFF"};
    45
    56int status (int argc, char **argv) {
    6 
    7   int i, Nobject;
    8   Stack *stack;
    9   Job   *job;
    107
    118  PrintJobStack (PCONTROL_JOB_PENDING);
    … …  
    2017  PrintHostStack (PCONTROL_HOST_BUSY);
    2118  PrintHostStack (PCONTROL_HOST_DONE);
     19  return (TRUE);
    2220}
    2321
    24 PrintJobStack (int Nstack) {
     22int PrintJobStack (int Nstack) {
    2523
    2624  int i, j, Nobject;
    … …  
    4139    fprintf (stdout, "\n");
    4240  }
     41  return (TRUE);
    4342}
    4443
    45 PrintHostStack (int Nstack) {
     44int PrintHostStack (int Nstack) {
    4645
    47   int i, j, Nobject;
     46  int i, Nobject;
    4847  Stack *stack;
    4948  Host *host;
    … …  
    5958    fprintf (stdout, "\n");
    6059  }
     60  return (TRUE);
    6161}
    6262

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

    r4450 r4689  
    33int stdout_pc (int argc, char **argv) {
    44
    5   int N, JobID, stack;
     5  int JobID;
    66  Job *job;
    77  IOBuffer *buffer;
    … …  
    3434int stderr_pc (int argc, char **argv) {
    3535
    36   int N, JobID;
     36  int JobID;
    3737  Job *job;
    3838  IOBuffer *buffer;
Note: See TracChangeset for help on using the changeset viewer.