IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 39419


Ignore:
Timestamp:
Mar 1, 2016, 11:34:48 AM (10 years ago)
Author:
eugene
Message:

list unused parameters; replace old signal code with SetInterrupt, ClearInterrupt; fix unsigned / signed int inconsistencies

Location:
branches/eam_branches/ohana.20160226/src/opihi
Files:
104 edited

Legend:

Unmodified
Added
Removed

  • branches/eam_branches/ohana.20160226/src/opihi/cmd.astro/flux.c

    r27611 r39419  
    11# include "astro.h"
     2# include <signal.h>
    23
    34int flux (int argc, char **argv) {
    45 
    56  int i, j, k, xmin, ymin, xmax, ymax;
    6   void *oldsignal;
    77  double ax, ay, s, S, flux;
    88  double bx[5], by[5], x[5], y[5], bb[5];
    … …  
    5555   we have to add up the angles for concave contours */
    5656  flux = 0;
    57   oldsignal = signal (SIGINT, handle_interrupt);
    58   interrupt = FALSE;
     57
     58  struct sigaction *old_sigaction = SetInterrupt();
    5959  for (j = ymin; (j < ymax) && !interrupt; j++) {
    6060    V = (float *)(buf[0].matrix.buffer) + j*buf[0].matrix.Naxis[0] + xmin;
    … …  
    7272    }
    7373  }
    74   signal (SIGINT, oldsignal);
     74  ClearInterrupt (old_sigaction);
    7575
    7676  gprint (GP_LOG, "flux: %f\n", flux);

  • branches/eam_branches/ohana.20160226/src/opihi/cmd.astro/imfit-fgauss.c

    r20936 r39419  
    4141/* real 2D gaussian -- x, y, sx, sy, sxy, I, sky */
    4242opihi_flt fgaussTD (opihi_flt x, opihi_flt y, opihi_flt *par, int Npar, opihi_flt *dpar) {
     43  OHANA_UNUSED_PARAM(Npar);
    4344
    4445  opihi_flt X, Y, px, py;

  • branches/eam_branches/ohana.20160226/src/opihi/cmd.astro/imfit-pgauss-psf.c

    r20936 r39419  
    3939/* pseudo 2D gaussian -- x, y, (sx), (sy), (sxy), I, sky */
    4040opihi_flt pgauss_psfTD (opihi_flt x, opihi_flt y, opihi_flt *par, int Npar, opihi_flt *dpar) {
     41  OHANA_UNUSED_PARAM(Npar);
    4142
    4243  opihi_flt X, Y, px, py;

  • branches/eam_branches/ohana.20160226/src/opihi/cmd.astro/imfit-pgauss.c

    r20936 r39419  
    4141/* pseudo 2D gaussian -- x, y, sx, sy, sxy, I, sky */
    4242opihi_flt pgaussTD (opihi_flt x, opihi_flt y, opihi_flt *par, int Npar, opihi_flt *dpar) {
     43  OHANA_UNUSED_PARAM(Npar);
    4344
    4445  opihi_flt X, Y, px, py;

  • branches/eam_branches/ohana.20160226/src/opihi/cmd.astro/imfit-qfgauss.c

    r20936 r39419  
    4545/* one component, two slopes: (1 + z^M + z^N)^(-1) -- x, y, sx, sy, sxy, I, sky */
    4646opihi_flt qfgaussTD (opihi_flt x, opihi_flt y, opihi_flt *par, int Npar, opihi_flt *dpar) {
     47  OHANA_UNUSED_PARAM(Npar);
    4748
    4849  opihi_flt X, Y, px, py;

  • branches/eam_branches/ohana.20160226/src/opihi/cmd.astro/imfit-qgauss-psf.c

    r20936 r39419  
    4242/* one component, two slopes: (1 + z^M + z^N)^(-1) -- x, y, sx, sy, sxy, I, sky, sr */
    4343opihi_flt qgauss_psfTD (opihi_flt x, opihi_flt y, opihi_flt *par, int Npar, opihi_flt *dpar) {
     44  OHANA_UNUSED_PARAM(Npar);
    4445
    4546  opihi_flt X, Y, px, py;

  • branches/eam_branches/ohana.20160226/src/opihi/cmd.astro/imfit-qgauss.c

    r20936 r39419  
    4545/* one component, two slopes: (1 + z^M + z^N)^(-1) -- x, y, sx, sy, sxy, I, sky, sr */
    4646opihi_flt qgaussTD (opihi_flt x, opihi_flt y, opihi_flt *par, int Npar, opihi_flt *dpar) {
     47  OHANA_UNUSED_PARAM(Npar);
    4748
    4849  opihi_flt X, Y, px, py;

  • branches/eam_branches/ohana.20160226/src/opihi/cmd.astro/imfit-qrgauss.c

    r20936 r39419  
    4545
    4646opihi_flt qrgaussTD (opihi_flt x, opihi_flt y, opihi_flt *par, int Npar, opihi_flt *dpar) {
     47  OHANA_UNUSED_PARAM(Npar);
    4748
    4849  opihi_flt X, Y, px, py;

  • branches/eam_branches/ohana.20160226/src/opihi/cmd.astro/imfit-rgauss.c

    r20936 r39419  
    3737/* two components: (1 + z_1 + 0.5*z_1^2 + z_2^N)^(-1) -- x, y, sx1, sy1, sxy1, I, sky, sx2, sy2, sxy2 */
    3838opihi_flt rgaussTD (opihi_flt x, opihi_flt y, opihi_flt *par, int Npar, opihi_flt *dpar) {
     39  OHANA_UNUSED_PARAM(Npar);
    3940
    4041  opihi_flt X, Y, px1, py1, px2, py2;

  • branches/eam_branches/ohana.20160226/src/opihi/cmd.astro/imfit-serbulge.c

    r20936 r39419  
    4242/* exp (-b (r/r_e)^(1/n)) + pgauss (r) */
    4343opihi_flt serbulgeTD (opihi_flt x, opihi_flt y, opihi_flt *par, int Npar, opihi_flt *dpar) {
     44  OHANA_UNUSED_PARAM(Npar);
    4445
    4546  opihi_flt X, Y, px1, px2, py1, py2;

  • branches/eam_branches/ohana.20160226/src/opihi/cmd.astro/imfit-sersic.c

    r20936 r39419  
    3434/* exp (-b (r/r_e)^(1/n)) */
    3535opihi_flt sersicTD (opihi_flt x, opihi_flt y, opihi_flt *par, int Npar, opihi_flt *dpar) {
     36  OHANA_UNUSED_PARAM(Npar);
    3637
    3738  opihi_flt X, Y, px, py;

  • branches/eam_branches/ohana.20160226/src/opihi/cmd.astro/imfit-sgauss-psf.c

    r20936 r39419  
    4444/* two components: (1 + z_1 + z_2^N)^(-1) -- x, y, sx1, sy1, sxy1, I, sky, sx2, sy2, sxy2 */
    4545opihi_flt sgauss_psfTD (opihi_flt x, opihi_flt y, opihi_flt *par, int Npar, opihi_flt *dpar) {
     46  OHANA_UNUSED_PARAM(Npar);
    4647
    4748  opihi_flt X, Y, px1, py1, px2, py2;

  • branches/eam_branches/ohana.20160226/src/opihi/cmd.astro/imfit-sgauss.c

    r20936 r39419  
    5353/* two components: (1 + z_1 + z_2^N)^(-1) -- x, y, sx1, sy1, sxy1, I, sky, sx2, sy2, sxy2 */
    5454opihi_flt sgaussTD (opihi_flt x, opihi_flt y, opihi_flt *par, int Npar, opihi_flt *dpar) {
     55  OHANA_UNUSED_PARAM(Npar);
    5556
    5657  opihi_flt X, Y, px1, py1, px2, py2;

  • branches/eam_branches/ohana.20160226/src/opihi/cmd.astro/imfit-tgauss.c

    r20936 r39419  
    3232/* two components: (1 + z_1^M + z_2^N)^(-1) -- x, y, sx1, sy1, sxy1, I, sky, sx2, sy2, sxy2 */
    3333opihi_flt tgaussTD (opihi_flt x, opihi_flt y, opihi_flt *par, int Npar, opihi_flt *dpar) {
     34  OHANA_UNUSED_PARAM(Npar);
    3435
    3536  opihi_flt X, Y, px1, py1, px2, py2;

  • branches/eam_branches/ohana.20160226/src/opihi/cmd.astro/imfit-vgauss.c

    r20936 r39419  
    2727/* pseudo 2D gaussian with opihi_flting 2nd and 3rd order terms -- x, y, sx, sy, sxy, I, sky, f1, f2 */
    2828opihi_flt vgaussTD (opihi_flt x, opihi_flt y, opihi_flt *par, int Npar, opihi_flt *dpar) {
     29  OHANA_UNUSED_PARAM(Npar);
    2930
    3031  opihi_flt X, Y, px, py;

  • branches/eam_branches/ohana.20160226/src/opihi/cmd.astro/spexseq.c

    r33662 r39419  
    4343
    4444void get_sequence (Object *object, int Nobject, int idx1, float Dmax, float f1, float f2, int pin1, int pin2) {
     45  OHANA_UNUSED_PARAM(pin1);
     46  OHANA_UNUSED_PARAM(pin2);
    4547
    4648  int i, j, N;

  • branches/eam_branches/ohana.20160226/src/opihi/cmd.basic/continue.c

    r10846 r39419  
    22
    33int exec_next (int argc, char **argv) {
     4  OHANA_UNUSED_PARAM(argc);
     5  OHANA_UNUSED_PARAM(argv);
     6
    47  loop_next = TRUE;
    58  return (TRUE);
    … …  
    710
    811int exec_last (int argc, char **argv) {
     12  OHANA_UNUSED_PARAM(argc);
     13  OHANA_UNUSED_PARAM(argv);
     14
    915  loop_last = TRUE;
    1016  return (TRUE);

  • branches/eam_branches/ohana.20160226/src/opihi/cmd.basic/list_help.c

    r27611 r39419  
    22
    33int list_help (int argc, char **argv) {
     4  OHANA_UNUSED_PARAM(argc);
     5  OHANA_UNUSED_PARAM(argv);
    46
    57  FILE *f;

  • branches/eam_branches/ohana.20160226/src/opihi/cmd.basic/list_vars.c

    r2598 r39419  
    22
    33int list_vars (int argc, char **argv) {
     4  OHANA_UNUSED_PARAM(argc);
     5  OHANA_UNUSED_PARAM(argv);
    46
    57  ListVariables ();

  • branches/eam_branches/ohana.20160226/src/opihi/cmd.basic/nop.c

    r26891 r39419  
    22
    33int nop (int argc, char **argv) {
     4  OHANA_UNUSED_PARAM(argc);
     5  OHANA_UNUSED_PARAM(argv);
     6
    47  return (TRUE);
    58}

  • branches/eam_branches/ohana.20160226/src/opihi/cmd.basic/run_for.c

    r33963 r39419  
    104104
    105105  status = TRUE;
    106   interrupt = FALSE;
    107106  for (value = start; (sign*value < sign*end) && !interrupt; value += delta) {
    108107    if ((int)value == value)

  • branches/eam_branches/ohana.20160226/src/opihi/cmd.basic/run_foreach.c

    r33963 r39419  
    7272
    7373  status = TRUE;
    74   interrupt = FALSE;
    7574  for (i = 2; (i < argc) && !interrupt; i++) {
    7675    set_str_variable (argv[1], argv[i]);

  • branches/eam_branches/ohana.20160226/src/opihi/cmd.basic/shell.c

    r33662 r39419  
    5151  // wait for process to finish or timeout
    5252  // loop forever if desired, but catch C-C and stop the process on interrupt
    53   interrupt = FALSE;
     53  struct sigaction *old_sigaction = SetInterrupt();
    5454  while (!interrupt) {
    5555    result = waitpid (pid, &wait_status, WNOHANG);
    … …  
    5959          case ECHILD:
    6060            gprint (GP_ERR, "unknown PID, not a child process: %d\n", pid);
     61            ClearInterrupt (old_sigaction);
    6162            return (FALSE);
    6263          default:
    … …  
    7273          if (DTIME(now, start) > timeout) {
    7374            gprint (GP_ERR, "timeout on %s (pid %d)\n", argv[1], pid);
     75            ClearInterrupt (old_sigaction);
    7476            return (FALSE);
    7577          }
    … …  
    8385        }
    8486        if (WIFEXITED(wait_status)) {
     87          ClearInterrupt (old_sigaction);
    8588          exit_status = WEXITSTATUS(wait_status);
    8689          if (exit_status) {
    … …  
    9194        }
    9295        if (WIFSIGNALED(wait_status)) {
     96          ClearInterrupt (old_sigaction);
    9397          gprint (GP_ERR, "job %d exited on signal %d\n", pid, WTERMSIG(wait_status));
    9498          return (FALSE);
    … …  
    100104    }
    101105  }
     106  ClearInterrupt (old_sigaction);
    102107  gprint (GP_ERR, "caught interrupt, killing %s (%d)\n", argv[1], pid);
    103108

  • branches/eam_branches/ohana.20160226/src/opihi/cmd.data/book_commands.c

    r17419 r39419  
    22
    33int book_list (int argc, char **argv) {
     4  OHANA_UNUSED_PARAM(argv);
    45  if (argc != 1) {
    56    gprint (GP_ERR, "USAGE: book list\n");

  • branches/eam_branches/ohana.20160226/src/opihi/cmd.data/cursor.c

    r33662 r39419  
    66  int i, N, kapa, VERBOSE;
    77  double X, Y, R, D, Z;
    8   void *oldsignal;
    98
    109  // XXX need to be able to specify graph vs image coords
    … …  
    3837  KiiCursorOn (kapa);
    3938 
    40   oldsignal = signal (SIGINT, handle_interrupt);
    41   interrupt = FALSE;
    42 
     39  struct sigaction *old_sigaction = SetInterrupt();
    4340  for (i = 0; ((i < N) || (N == 0)) && !interrupt; i++) {
    4441
    … …  
    6259    if (!strcasecmp (key, "Q")) break;
    6360  }
     61  ClearInterrupt (old_sigaction);
    6462
    65   signal (SIGINT, oldsignal);
    6663  KiiCursorOff (kapa);
    6764  return (TRUE);

  • branches/eam_branches/ohana.20160226/src/opihi/cmd.data/gaussdeviate.c

    r39248 r39419  
    3030
    3131int gaussintegral (int argc, char **argv) {
     32  OHANA_UNUSED_PARAM(argc);
     33  OHANA_UNUSED_PARAM(argv);
    3234 
    3335  gprint (GP_ERR, "fix gaussintegral\n");

  • branches/eam_branches/ohana.20160226/src/opihi/cmd.data/list_buffers.c

    r33662 r39419  
    22
    33int list_buffers (int argc, char **argv) {
     4  OHANA_UNUSED_PARAM(argv);
    45
    56  if (argc == 3) PrintBuffers (TRUE);

  • branches/eam_branches/ohana.20160226/src/opihi/cmd.data/list_vectors.c

    r33662 r39419  
    22
    33int list_vectors (int argc, char **argv) {
     4  OHANA_UNUSED_PARAM(argc);
     5  OHANA_UNUSED_PARAM(argv);
    46
    57  ListVectors ();

  • branches/eam_branches/ohana.20160226/src/opihi/cmd.data/medimage.c

    r36679 r39419  
    1818
    1919int medimage_help (int argc, char **argv) {
     20  OHANA_UNUSED_PARAM(argc);
     21  OHANA_UNUSED_PARAM(argv);
    2022
    2123  gprint (GP_ERR, "USAGE: medimage (command)\n");

  • branches/eam_branches/ohana.20160226/src/opihi/cmd.data/medimage_commands.c

    r39233 r39419  
    22
    33int medimage_list (int argc, char **argv) {
     4  OHANA_UNUSED_PARAM(argv);
     5
    46  if (argc != 1) {
    57    gprint (GP_ERR, "USAGE: medimage list\n");

  • branches/eam_branches/ohana.20160226/src/opihi/cmd.data/queuelist.c

    r7917 r39419  
    22
    33int queuelist (int argc, char **argv) {
     4  OHANA_UNUSED_PARAM(argv);
    45 
    56  if (argc != 1) {

  • branches/eam_branches/ohana.20160226/src/opihi/cmd.data/spline.c

    r35109 r39419  
    2323
    2424int spline_help (int argc, char **argv) {
     25  OHANA_UNUSED_PARAM(argc);
     26  OHANA_UNUSED_PARAM(argv);
    2527
    2628  gprint (GP_ERR, "USAGE: spline (command)\n");

  • branches/eam_branches/ohana.20160226/src/opihi/cmd.data/spline_commands.c

    r35109 r39419  
    22
    33int spline_list (int argc, char **argv) {
     4  OHANA_UNUSED_PARAM(argv);
     5
    46  if (argc != 1) {
    57    gprint (GP_ERR, "USAGE: spline list\n");

  • branches/eam_branches/ohana.20160226/src/opihi/cmd.data/uniq.c

    r39297 r39419  
    5656    int onePercent = ivec->Nelements / 100;
    5757
    58     void *Signal = signal (SIGINT, handle_interrupt);
    59     interrupt = FALSE;
     58    struct sigaction *old_sigaction = SetInterrupt();
    6059    for (i = 0; (i < ivec->Nelements) && !interrupt; Nnew++) {
    6160      vtgt[Nnew] = *vsrc;
    … …  
    7271      }
    7372    }
    74     signal (SIGINT, Signal);
     73    ClearInterrupt (old_sigaction);
    7574    if (VERBOSE) gprint (GP_ERR, "\n");
    7675    free (indata);
    … …  
    9089    int onePercent = ivec->Nelements / 100;
    9190
    92     void *Signal = signal (SIGINT, handle_interrupt);
    93     interrupt = FALSE;
     91    struct sigaction *old_sigaction = SetInterrupt();
    9492    for (i = 0; (i < ivec->Nelements) && !interrupt; Nnew++) {
    9593      vtgt[Nnew] = *vsrc;
    … …  
    106104      }
    107105    }
    108     signal (SIGINT, Signal);
     106    ClearInterrupt (old_sigaction);
    109107    if (VERBOSE) gprint (GP_ERR, "\n");
    110108    free (indata);

  • branches/eam_branches/ohana.20160226/src/opihi/cmd.data/vellipse.c

    r36679 r39419  
    230230// XXX NOTE that PHI is defined with the wrong sign, should fix this...
    231231opihi_flt fellipseOD (opihi_flt alpha, opihi_flt *par, int Npar, opihi_flt *dpar) {
     232  OHANA_UNUSED_PARAM(Npar);
    232233 
    233234  static int pass = 0;

  • branches/eam_branches/ohana.20160226/src/opihi/cmd.data/vgauss.c

    r36489 r39419  
    127127/* pars: x_o, sigma, I, back */
    128128opihi_flt fgaussOD (opihi_flt x, opihi_flt *par, int Npar, opihi_flt *dpar) {
     129  OHANA_UNUSED_PARAM(Npar);
    129130
    130131  opihi_flt z, r, f;

  • branches/eam_branches/ohana.20160226/src/opihi/cmd.data/vmaxwell.c

    r20936 r39419  
    9696// f = C3 + C2*(x - C4)^2 * exp(-0.5*(x - C0)^2 / C1^2)
    9797opihi_flt fmaxwellOD (opihi_flt x, opihi_flt *par, int Npar, opihi_flt *dpar) {
     98  OHANA_UNUSED_PARAM(Npar);
    9899
    99100  opihi_flt z, r, f;

  • branches/eam_branches/ohana.20160226/src/opihi/dvo/avextract.c

    r39360 r39419  
    44 
    55  off_t i, j, n, m;
    6   int N, Npts, NPTS, last, next, state, Nfields, Nreturn, Ncstack, Nstack;
     6  int N, Npts, NPTS, last, next, state, Nfields, Nreturn, Nstack;
    77  int Nsecfilt, VERBOSE;
    88  char **cstack, name[1024];
     9  unsigned int Ncstack;
    910
    1011  Catalog catalog;
    … …  
    169170
    170171  // grab data from all selected sky regions
    171   void *Signal = signal (SIGINT, handle_interrupt);
    172   interrupt = FALSE;
     172  struct sigaction *old_sigaction = SetInterrupt();
    173173  for (i = 0; (i < skylist[0].Nregions) && !interrupt; i++) {
    174174
    … …  
    254254    dvo_catalog_free (&catalog);
    255255  }
    256   signal (SIGINT, Signal);
    257   interrupt = FALSE;
     256  ClearInterrupt (old_sigaction);
     257
    258258  for (n = 0; n < Nreturn; n++) {
    259259    ResetVector (vec[n], fields[n].type, Npts);

  • branches/eam_branches/ohana.20160226/src/opihi/dvo/avmatch.c

    r39360 r39419  
    1717  int VERBOSE;
    1818  char name[1024], *found;
    19   void *Signal;
    2019  float RADIUS;
    2120
    … …  
    179178
    180179  // grab data from all selected sky regions
    181   Signal = signal (SIGINT, handle_interrupt);
    182   interrupt = FALSE;
     180  struct sigaction *old_sigaction = SetInterrupt();
    183181  for (i = 0; (i < skylist[0].Nregions) && !interrupt; i++) {
    184182
    … …  
    253251    dvo_catalog_free (&catalog);
    254252  }
    255   signal (SIGINT, Signal);
    256   interrupt = FALSE;
     253  ClearInterrupt (old_sigaction);
    257254
    258255  // write vectors to a table (this is used by parallel dvo operations, but can be used elsewhere)

  • branches/eam_branches/ohana.20160226/src/opihi/dvo/catname.c

    r37807 r39419  
    5555
    5656  // prepare to handle interrupt signals
    57   signal (SIGINT, handle_interrupt);
    58   interrupt = FALSE;
     57  struct sigaction *old_sigaction = SetInterrupt();
    5958
    6059  for (i = 0; (i < skylist[0].Nregions) && !interrupt; i++) {
    … …  
    9998    set_str_variable ("CATNAME", filename);
    10099  }
     100  ClearInterrupt (old_sigaction);
    101101
    102102  return (TRUE);

  • branches/eam_branches/ohana.20160226/src/opihi/dvo/ccd.c

    r38471 r39419  
    6262
    6363  // grab data from all selected sky regions
    64   signal (SIGINT, handle_interrupt);
    65   interrupt = FALSE;
    6664
    6765  /* loop over regions, extract data for each region */
     66  struct sigaction *old_sigaction = SetInterrupt();
    6867  for (k = 0; (k < skylist[0].Nregions) && !interrupt; k++) {
    6968    /* lock, load, unlock catalog */
    … …  
    119118    dvo_catalog_free (&catalog);
    120119  }
     120  ClearInterrupt (old_sigaction);
    121121
    122122  xvec[0].Nelements = yvec[0].Nelements = Npts;

  • branches/eam_branches/ohana.20160226/src/opihi/dvo/cmd.c

    r38471 r39419  
    2121  skylist = NULL;
    2222  selection = NULL;
     23  struct sigaction *old_sigaction = NULL:
    2324
    2425  /* load photcode information */
    … …  
    6061
    6162  // grab data from all selected sky regions
    62   // void *Signal = signal (SIGINT, handle_interrupt);
    63   signal (SIGINT, handle_interrupt);
    64   interrupt = FALSE;
     63  old_sigaction = SetInterrupt();
    6564
    6665  /* loop over regions, extract data for each region */
    … …  
    118117    dvo_catalog_free (&catalog);
    119118  }
     119  ClearInterrupt (old_sigaction);
    120120
    121121  xvec[0].Nelements = yvec[0].Nelements = Npts;
    … …  
    129129
    130130escape:
     131  ClearInterrupt (old_sigaction);
    131132  dvo_catalog_free (&catalog);
    132133  SkyListFree (skylist);

  • branches/eam_branches/ohana.20160226/src/opihi/dvo/dmt.c

    r38471 r39419  
    33/* extract vectors giving delta mags for multiple measurements */
    44int dmt (int argc, char **argv) {
     5  OHANA_UNUSED_PARAM(argc);
     6  OHANA_UNUSED_PARAM(argv);
    57 
    68  // XXX this needs to be fixed: how to access different graphs at once?

  • branches/eam_branches/ohana.20160226/src/opihi/dvo/dvo.c.in

    r33662 r39419  
    99/* program-dependent initialization */
    1010void program_init (int *argc, char **argv) {
     11  OHANA_UNUSED_PARAM(argc);
     12  OHANA_UNUSED_PARAM(argv);
    1113 
    1214  auto_break = TRUE;

  • branches/eam_branches/ohana.20160226/src/opihi/dvo/dvo_host_utils.c

    r39360 r39419  
    249249// and has since been re-run
    250250int HostTableReloadResults (char *uniquer, int VERBOSE) {
     251  OHANA_UNUSED_PARAM(VERBOSE);
    251252
    252253  int i;
    … …  
    317318// and has since been re-run
    318319int HostTableGetResults (char *uniquer, int VERBOSE) {
     320  OHANA_UNUSED_PARAM(VERBOSE);
    319321
    320322  int i;

  • branches/eam_branches/ohana.20160226/src/opihi/dvo/fitcolors.c

    r39233 r39419  
    1414  int mode[4];
    1515  int Nsecfilt, status;
    16   void *oldsignal;
    1716  char *cmd, *outcmd, *camera;
    1817  char name[64], filename[64], plotname[64], label[64];
    … …  
    4039  colorFit = NULL;
    4140  deltaFit = NULL;
    42 
    43   oldsignal = signal (SIGINT, handle_interrupt);
    44   interrupt = FALSE;
    4541
    4642  /* load photcode information */
    … …  
    199195    graphdata.ptype = 2;
    200196  }
     197
     198  struct sigaction *old_sigaction = SetInterrupt();
    201199
    202200  /*** generate the color-color vectors for the pairs ***/
    … …  
    357355  if (colorFit != NULL) free (colorFit);
    358356  if (deltaFit != NULL) free (deltaFit);
    359   signal (SIGINT, oldsignal);
     357  ClearInterrupt (old_sigaction);
    360358  return (TRUE);
    361359
    … …  
    381379  DeleteVector (xvec);
    382380  DeleteVector (yvec);
    383   signal (SIGINT, oldsignal);
     381  ClearInterrupt (old_sigaction);
     382
    384383  return (FALSE);
    385384}

  • branches/eam_branches/ohana.20160226/src/opihi/dvo/fitsed.c

    r38471 r39419  
    2727  int N, done, Nfit;
    2828  int status;
    29   void *oldsignal;
    3029  char name[64], line[1024], key[20];
    3130  float *fitmags, *fiterrs, *wavecode, *vegaToAB;
    … …  
    4847  SEDtableRow sourceValue, sourceError;
    4948  SEDfit minFit, testFit;
     49  struct sigaction *old_sigaction = NULL;
    5050
    5151  /* defaults */
    … …  
    7474  fiterrs = NULL;
    7575  fitmags = NULL;
    76 
    77   oldsignal = signal (SIGINT, handle_interrupt);
    78   interrupt = FALSE;
    7976
    8077  /* load photcode information */
    … …  
    184181  /* loop over regions, extract data for each region */
    185182  // XXX add interrupt checks
     183  old_sigaction = SetInterrupt();
    186184  gprint (GP_ERR, "using "OFF_T_FMT" possible regions\n",  skylist[0].Nregions);
    187   for (k = 0; k < skylist[0].Nregions; k++) {
     185  for (k = 0; (k < skylist[0].Nregions) && !interrupt; k++) {
    188186    /* lock, load, unlock catalog */
    189187    dvo_catalog_init (&catalog, TRUE);
    … …  
    377375  if (sourceError.mags != NULL) free (sourceError.mags);
    378376
    379   signal (SIGINT, oldsignal);
     377  ClearInterrupt (old_sigaction);
    380378  return (status);
    381379}

  • branches/eam_branches/ohana.20160226/src/opihi/dvo/gcat.c

    r39294 r39419  
    5757
    5858  // prepare to handle interrupt signals
    59   signal (SIGINT, handle_interrupt);
    60   interrupt = FALSE;
     59  struct sigaction *old_sigaction = SetInterrupt();
    6160
    6261  for (i = 0; (i < skylist[0].Nregions) && !interrupt; i++) {
    … …  
    101100    set_str_variable ("CATNAME", hostfile);
    102101  }
     102  ClearInterrupt (old_sigaction);
    103103
    104104  return (TRUE);

  • branches/eam_branches/ohana.20160226/src/opihi/dvo/gstar.c

    r39298 r39419  
    876876
    877877void printPhotcodeSequence (Average *average, SecFilt *secfilt, int entry, int type) {
     878  OHANA_UNUSED_PARAM(average);
    878879
    879880  int seq;

  • branches/eam_branches/ohana.20160226/src/opihi/dvo/imdata.c

    r38471 r39419  
    128128
    129129  // prepare to handle interrupt signals
    130   signal (SIGINT, handle_interrupt);
    131   interrupt = FALSE;
     130  struct sigaction *old_sigaction = SetInterrupt();
    132131
    133132  /* for each region file, extract the data of interest in the right time range */
    … …  
    216215    dvo_catalog_free (&catalog);
    217216  }
     217  ClearInterrupt (old_sigaction);
    218218 
    219219  vec[0].Nelements = N;

  • branches/eam_branches/ohana.20160226/src/opihi/dvo/imextract.c

    r37807 r39419  
    44 
    55  off_t i, j, Nimage;
    6   int n, N, Npts, NPTS, last, next, state, Nfields, Nreturn, Ncstack, Nstack;
     6  int n, N, Npts, NPTS, last, next, state, Nfields, Nreturn, Nstack;
    77  char **cstack, name[1024];
    8   void *Signal;
    98
    109  Vector **vec;
    … …  
    5756
    5857  // parse the remainder of the line as a boolean math expression
     58  unsigned int Ncstack;
    5959  cstack = isolate_elements (argc-next, &argv[next], &Ncstack);
    6060 
    … …  
    9797
    9898  // grab data from all selected sky regions
    99   Signal = signal (SIGINT, handle_interrupt);
    100   interrupt = FALSE;
     99  struct sigaction *old_sigaction = SetInterrupt();
    101100  for (j = 0; (j < Nimage) && !interrupt; j++) {
    102101
    … …  
    128127    }
    129128  }
    130   signal (SIGINT, Signal);
    131   interrupt = FALSE;
     129  ClearInterrupt (old_sigaction);
     130
    132131  for (n = 0; n < Nreturn; n++) {
    133132    vec[n][0].Nelements = Npts;

  • branches/eam_branches/ohana.20160226/src/opihi/dvo/mextract.c

    r39360 r39419  
    2525 
    2626  off_t i, j, k, m; // used for counter averages and measures
    27   int n, N, Npts, NPTS, last, next, state, Nfields, Nreturn, Ncstack, Nstack;
     27  int n, N, Npts, NPTS, last, next, state, Nfields, Nreturn, Nstack;
    2828  int Nsecfilt, VERBOSE, loadImages;
    2929  char **cstack, name[1024];
    3030  dbValue *values;
    31   void *Signal;
    3231
    3332  Catalog catalog;
    … …  
    115114
    116115  // parse the remainder of the line as a boolean math expression
     116  unsigned int Ncstack;
    117117  cstack = isolate_elements (argc-next, &argv[next], &Ncstack);
    118118 
    … …  
    217217
    218218  // grab data from all selected sky regions
    219   Signal = signal (SIGINT, handle_interrupt);
    220   interrupt = FALSE;
    221 
    222   // fprintf (stderr, "done setup...");
     219  struct sigaction *old_sigaction = SetInterrupt();
    223220
    224221  for (i = 0; (i < skylist[0].Nregions) && !interrupt; i++) {
    … …  
    310307    // dbStackFreeReset ();
    311308  }
    312   signal (SIGINT, Signal);
     309  ClearInterrupt (old_sigaction);
    313310  interrupt = FALSE;
    314311

  • branches/eam_branches/ohana.20160226/src/opihi/dvo/mmatch.c

    r39360 r39419  
    1414  int VERBOSE;
    1515  char name[1024];
    16   void *Signal;
    1716  float RADIUS;
    1817
    … …  
    237236
    238237  // grab data from all selected sky regions
    239   Signal = signal (SIGINT, handle_interrupt);
    240   interrupt = FALSE;
     238  struct sigaction *old_sigaction = SetInterrupt();
    241239  for (i = 0; (i < skylist[0].Nregions) && !interrupt; i++) {
    242240
    … …  
    331329    dvo_catalog_free (&catalog);
    332330  }
    333   signal (SIGINT, Signal);
    334   interrupt = FALSE;
     331  ClearInterrupt (old_sigaction);
    335332
    336333  for (n = 0; n < Nfields; n++) {

  • branches/eam_branches/ohana.20160226/src/opihi/dvo/mmextract.c

    r38471 r39419  
    66  off_t i, j, k, m;
    77  int n, N, Npts, NPTS, last, next, state;
    8   int Nfields, Nreturn, Nreturn_base, Ncstack1, Ncstack2, Nstack1, Nstack2;
     8  int Nfields, Nreturn, Nreturn_base, Nstack1, Nstack2;
    99  int Nwhere, Iwhere, Nmatch, Imatch, NTABLE, Nt1, Nt2, n1, n2;
    1010  int Nsecfilt, VERBOSE, loadImages;
    1111  char **cstack1, **cstack2, name1[1024], name2[1024];
    1212  dbValue *values, **table1, **table2;
    13   void *Signal;
    1413
    1514  Catalog catalog;
    … …  
    102101
    103102  // parse the 'where' and 'matched to' segments of the line as boolean math expressions
     103  unsigned int Ncstack1, Ncstack2;
    104104  cstack1 = isolate_elements (Nwhere, &argv[Iwhere], &Ncstack1);
    105105  cstack2 = isolate_elements (Nmatch, &argv[Imatch], &Ncstack2);
    … …  
    178178
    179179  // grab data from all selected sky regions
    180   Signal = signal (SIGINT, handle_interrupt);
    181   interrupt = FALSE;
     180  struct sigaction *old_sigaction = SetInterrupt();
     181
    182182  for (i = 0; (i < skylist[0].Nregions) && !interrupt; i++) {
    183183    /* lock, load, unlock catalog */
    … …  
    286286    // dbStackFreeReset ();
    287287  }
    288   signal (SIGINT, Signal);
    289   interrupt = FALSE;
     288  ClearInterrupt (old_sigaction);
    290289
    291290  // free excess memory

  • branches/eam_branches/ohana.20160226/src/opihi/dvo/objectcoverage.c

    r39233 r39419  
    174174  Nsecfilt = GetPhotcodeNsecfilt();
    175175  // grab data from all selected sky regions
    176   signal (SIGINT, handle_interrupt);
    177   interrupt = FALSE;
    178176
    179177  /* load region corresponding to selection above */
    180178  if ((skylist = SelectRegions (selection)) == NULL) goto escape;
     179
     180  struct sigaction *old_sigaction = SetInterrupt();
    181181
    182182  /* loop over regions, extract data for each region */
    … …  
    224224    }
    225225  }
     226  ClearInterrupt (old_sigaction);
    226227  return (TRUE);
    227228

  • branches/eam_branches/ohana.20160226/src/opihi/dvo/paverage.c

    r38471 r39419  
    9999
    100100  // prepare to handle interrupt signals
    101   signal (SIGINT, handle_interrupt);
    102   interrupt = FALSE;
     101  struct sigaction *old_sigaction = SetInterrupt();
    103102
    104103  Nloaded = 0;
    … …  
    154153    dvo_catalog_free (&catalog);
    155154  }
     155  ClearInterrupt (old_sigaction);
    156156  if (Npts > 0) {
    157157    KapaPrepPlot (kapa, Npts, &graphmode);

  • branches/eam_branches/ohana.20160226/src/opihi/dvo/pmeasure.c

    r38471 r39419  
    172172
    173173  // prepare to handle interrupt signals
    174   signal (SIGINT, handle_interrupt);
    175   interrupt = FALSE;
     174  struct sigaction *old_sigaction = SetInterrupt();
    176175
    177176  Nloaded = 0;
    … …  
    240239    dvo_catalog_free (&catalog);
    241240  }
     241  ClearInterrupt (old_sigaction);
     242
    242243  if (Npts > 0) {
    243244    KapaPrepPlot (kapa, Npts, &graphmode);

  • branches/eam_branches/ohana.20160226/src/opihi/dvo/procks.c

    r34584 r39419  
    7474    NROCKS = 100;
    7575    ALLOCATE (rocks, Rocks, NROCKS);
    76     for (i = 0; fscanf (f, "%lf %lf %d%lf%lf%lf %d%lf%lf%lf %d%lf%lf%lf",
     76    for (i = 0; fscanf (f, "%lf %lf %u%lf%lf%lf %u%lf%lf%lf %u%lf%lf%lf",
    7777                        &rocks[i].X[0], &rocks[i].Y[0],
    7878                        &rocks[i].t[0], &rocks[i].ra[0], &rocks[i].dec[0], &rocks[i].mag[0],

  • branches/eam_branches/ohana.20160226/src/opihi/dvo/showtile.c

    r37807 r39419  
    44
    55int showtile (int argc, char **argv) {
     6  OHANA_UNUSED_PARAM(argv);
    67
    78  int kapa, Nd, N, NPTS, status, i, InPic;

  • branches/eam_branches/ohana.20160226/src/opihi/dvo/skycat.c

    r39354 r39419  
    7171
    7272  // prepare to handle interrupt signals
    73   signal (SIGINT, handle_interrupt);
    74   interrupt = FALSE;
     73  struct sigaction *old_sigaction = SetInterrupt();
    7574
    7675  for (i = 0; (i < Nregions) && !interrupt; i++) {
    … …  
    113112    }
    114113  }
     114  ClearInterrupt (old_sigaction);
    115115
    116116  gprint (GP_ERR, "plotting %d catalogs\n", Npts/8);

  • branches/eam_branches/ohana.20160226/src/opihi/dvo/version.c

    r8653 r39419  
    33
    44int version (int argc, char **argv) {
     5  OHANA_UNUSED_PARAM(argc);
     6  OHANA_UNUSED_PARAM(argv);
    57
    68  char *tmp;

  • branches/eam_branches/ohana.20160226/src/opihi/include/dvoshell.h

    r37049 r39419  
    8181void          compare               PROTO((Catalog *catlog1, Catalog *catlog2, Vector *rvec,  Vector *dvec,  Vector *mvec, Vector *drvec, Vector *ddvec, Vector *dmvec, double radius));
    8282void          cprecess              PROTO((Average *average, off_t Naverage, double in_epoch, double out_epoch));
    83 void          image_subset          PROTO((Image *image, off_t Nimage, off_t **Subset, off_t *Nsubset, SkyRegionSelection *selection, unsigned long int tzero, double trange, int TimeSelect));
    8483off_t         match_image           PROTO((Image *image, off_t Nimage, unsigned int T, short int S));
    85 off_t         match_image_subset    PROTO((Image *image, off_t *subset, off_t Nsubset, unsigned int T, short int S));
    8684void          print_value           PROTO((double value, short int ival));
    8785CMPstars     *cmpReadFits           PROTO((FILE *f, off_t *nstars));

  • branches/eam_branches/ohana.20160226/src/opihi/include/shell.h

    r39227 r39419  
    132132#endif
    133133
     134struct sigaction *SetInterrupt          PROTO((void));
     135int           ClearInterrupt            PROTO((struct sigaction *old_sigaction));
    134136void          handle_interrupt          PROTO((int));
    135137char        **command_completer         PROTO((const char *, int, int));

  • branches/eam_branches/ohana.20160226/src/opihi/lib.data/hermitian.c

    r26891 r39419  
    33double hermitian_polynomial (double x, int order) {
    44  double value;
    5     switch (order) {
    6       case 0:
    7         value = hermitian_00(x);
    8         break;
    9       case 1:
    10         value = hermitian_01(x);
    11         break;
    12       case 2:
    13         value = hermitian_02(x);
    14         break;
    15       case 3:
    16         value = hermitian_03(x);
    17         break;
    18       case 4:
    19         value = hermitian_04(x);
    20         break;
    21       case 5:
    22         value = hermitian_05(x);
    23         break;
    24       case 6:
    25         value = hermitian_06(x);
    26         break;
    27       case 7:
    28         value = hermitian_07(x);
    29         break;
    30       case 8:
    31         value = hermitian_08(x);
    32         break;
    33       case 9:
    34         value = hermitian_09(x);
    35         break;
    36       case 10:
    37         value = hermitian_10(x);
    38         break;
    39       default:
    40         value = NAN;
    41         break;
    42     }
    43     return value;
     5  switch (order) {
     6    case 0:
     7      value = hermitian_00(x);
     8      break;
     9    case 1:
     10      value = hermitian_01(x);
     11      break;
     12    case 2:
     13      value = hermitian_02(x);
     14      break;
     15    case 3:
     16      value = hermitian_03(x);
     17      break;
     18    case 4:
     19      value = hermitian_04(x);
     20      break;
     21    case 5:
     22      value = hermitian_05(x);
     23      break;
     24    case 6:
     25      value = hermitian_06(x);
     26      break;
     27    case 7:
     28      value = hermitian_07(x);
     29      break;
     30    case 8:
     31      value = hermitian_08(x);
     32      break;
     33    case 9:
     34      value = hermitian_09(x);
     35      break;
     36    case 10:
     37      value = hermitian_10(x);
     38      break;
     39    default:
     40      value = NAN;
     41      break;
     42  }
     43  return value;
    4444}
    4545
    4646double hermitian_00(double x) {
    47     double value;
    48     // H_0(x) = 1
    49     value = 1;
    50     return value;
     47  OHANA_UNUSED_PARAM(x);
     48
     49  double value;
     50  // H_0(x) = 1
     51  value = 1;
     52  return value;
    5153}
    5254double hermitian_01(double x) {
    53     double value;
    54     // H_1(x) = x
    55     value = x;
    56     return value;
     55  double value;
     56  // H_1(x) = x
     57  value = x;
     58  return value;
    5759}
    5860double hermitian_02(double x) {
    59     double value, x2;
    60     // H_2(x) = x^2-1
    61     x2 = x*x;
    62     value = x2 - 1.0;
    63     return value;
     61  double value, x2;
     62  // H_2(x) = x^2-1
     63  x2 = x*x;
     64  value = x2 - 1.0;
     65  return value;
    6466}
    6567double hermitian_03(double x) {
    66     double value, x2;
    67     // H_3(x) = x^3-3x
    68     x2 = x*x;
    69     value = x*(x2 - 3.0);
    70     return value;
     68  double value, x2;
     69  // H_3(x) = x^3-3x
     70  x2 = x*x;
     71  value = x*(x2 - 3.0);
     72  return value;
    7173}
    7274double hermitian_04(double x) {
    73     double value, x2;
    74     // H_4(x) = x^4-6x^2+3
    75     x2 = x*x;
    76     value = (x2 - 6.0)*x2 + 3.0;
    77     return value;
     75  double value, x2;
     76  // H_4(x) = x^4-6x^2+3
     77  x2 = x*x;
     78  value = (x2 - 6.0)*x2 + 3.0;
     79  return value;
    7880}
    7981double hermitian_05(double x) {
    80     double value, x2;
    81     // H_5(x) = x^5-10x^3+15x
    82     x2 = x*x;
    83     value = ((x2 - 10.0)*x2 + 15.0)*x;
    84     return value;
     82  double value, x2;
     83  // H_5(x) = x^5-10x^3+15x
     84  x2 = x*x;
     85  value = ((x2 - 10.0)*x2 + 15.0)*x;
     86  return value;
    8587}
    8688double hermitian_06(double x) {
    87     double value, x2;
    88     // H_6(x) = x^6-15x^4+45x^2-15
    89     x2 = x*x;
    90     value = (((x2 - 15.0)*x2 + 45.0)*x2) - 15.0;
    91     return value;
     89  double value, x2;
     90  // H_6(x) = x^6-15x^4+45x^2-15
     91  x2 = x*x;
     92  value = (((x2 - 15.0)*x2 + 45.0)*x2) - 15.0;
     93  return value;
    9294}
    9395double hermitian_07(double x) {
    94     double value, x2;
    95     // H_7(x) = x^7-21x^5+105x^3-105x
    96     x2 = x*x;
    97     value = (((x2 - 21.0)*x2+105.0)*x2 - 105.0)*x;
    98     return value;
     96  double value, x2;
     97  // H_7(x) = x^7-21x^5+105x^3-105x
     98  x2 = x*x;
     99  value = (((x2 - 21.0)*x2+105.0)*x2 - 105.0)*x;
     100  return value;
    99101}
    100102double hermitian_08(double x) {
    101     double value, x2;
    102     // H_8(x) = x^8-28x^6+210x^4-420x^2+105
    103     x2 = x*x;
    104     value = ((((x2 - 28.0)*x2 + 210.0)*x2 - 420.0)*x2 + 105.0);
    105     return value;
     103  double value, x2;
     104  // H_8(x) = x^8-28x^6+210x^4-420x^2+105
     105  x2 = x*x;
     106  value = ((((x2 - 28.0)*x2 + 210.0)*x2 - 420.0)*x2 + 105.0);
     107  return value;
    106108}
    107109double hermitian_09(double x) {
    108     double value, x2;
    109     // H_9(x) = x^9-36x^7+378x^5-1260x^3+945x
    110     x2 = x*x;
    111     value = ((((x2 - 36.0)*x2 + 378.0)*x2 - 1260.0)*x2 + 945.0)*x;
    112     return value;
     110  double value, x2;
     111  // H_9(x) = x^9-36x^7+378x^5-1260x^3+945x
     112  x2 = x*x;
     113  value = ((((x2 - 36.0)*x2 + 378.0)*x2 - 1260.0)*x2 + 945.0)*x;
     114  return value;
    113115}
    114116double hermitian_10(double x) {
    115     double value, x2;
    116     // H_{10}(x) = x^{10}-45x^8+630x^6-3150x^4+4725x^2-945
    117     x2 = x*x;
    118     value = (((((x2 - 45.0)*x2 + 630.0)*x2 - 3150.0)*x2 + 4725.0)*x2 - 945.0);
    119     return value;
     117  double value, x2;
     118  // H_{10}(x) = x^{10}-45x^8+630x^6-3150x^4+4725x^2-945
     119  x2 = x*x;
     120  value = (((((x2 - 45.0)*x2 + 630.0)*x2 - 3150.0)*x2 + 4725.0)*x2 - 945.0);
     121  return value;
    120122}

  • branches/eam_branches/ohana.20160226/src/opihi/lib.shell/CommandOps.c

    r31667 r39419  
    151151/* tell readline to use out command_generator rather than basic completion */
    152152char **command_completer (const char *text, int start, int end) {
     153  OHANA_UNUSED_PARAM(end);
    153154 
    154155  char **matches;

  • branches/eam_branches/ohana.20160226/src/opihi/lib.shell/VectorIO.c

    r39360 r39419  
    8181  }
    8282  fprintf (stderr, "\n");
     83# else
     84  OHANA_UNUSED_PARAM(table);
     85  OHANA_UNUSED_PARAM(message);
    8386# endif
    8487  return TRUE;
    … …  
    99102  }
    100103  fprintf (stderr, "\n");
     104# else
     105  OHANA_UNUSED_PARAM(table);
     106  OHANA_UNUSED_PARAM(message);
    101107# endif
    102108  return TRUE;

  • branches/eam_branches/ohana.20160226/src/opihi/lib.shell/dvomath.c

    r36375 r39419  
    1616char *dvomath (int argc, char **argv, int *size, int validsize) {
    1717 
    18   int  i, Nstack, Ncstack;
     18  int  i, Nstack;
    1919  char   **cstack, *outname;
    2020  StackVar *stack;
    … …  
    2727
    2828  /* take char array with expression, convert to important elements */
     29  unsigned int Ncstack;
    2930  cstack = isolate_elements (argc, argv, &Ncstack);
    3031

  • branches/eam_branches/ohana.20160226/src/opihi/lib.shell/exec_loop.c

    r12332 r39419  
    33int exec_loop (Macro *loop) {
    44
    5   void *Signal;
    65  int j, status, ThisList;
    76  char *line;
    … …  
    1716
    1817  /* set up interrupts */
    19   Signal = signal (SIGINT, handle_interrupt);
    20   interrupt = FALSE;
     18  struct sigaction *old_sigaction = SetInterrupt();
    2119
    2220  /* process the list */
    … …  
    3230    if (loop_break || loop_last || loop_next) break;
    3331  }
    34   signal (SIGINT, Signal);
     32  ClearInterrupt (old_sigaction);
    3533
    3634  /* free remaining lines on the list, free the list, decrement the shell level */

  • branches/eam_branches/ohana.20160226/src/opihi/lib.shell/interrupt.c

    r27611 r39419  
    77
    88void handle_interrupt (int input) {
     9  OHANA_UNUSED_PARAM(input);
    910 
    1011  char string[64];
    1112  int Nask;
    1213
    13   signal (SIGINT, SIG_IGN);
     14  // signal (SIGINT, SIG_IGN);
    1415
    1516  Nask = 0;
    … …  
    3132    if ((string[0] == 'y') || (string[0] == 'Y')) {
    3233      interrupt = FALSE;
    33       signal (SIGINT, handle_interrupt);
     34      // signal (SIGINT, handle_interrupt);
    3435      Nint = 0;
    3536      return;
    … …  
    3839    if ((string[0] == 'n') || (string[0] == 'N')) {
    3940      interrupt = TRUE;
    40       signal (SIGINT, handle_interrupt);
     41      // signal (SIGINT, handle_interrupt);
    4142      Nint = 0;
    4243      return;
    … …  
    4546    if (Nask > 3) {
    4647      interrupt = TRUE;
    47       signal (SIGINT, handle_interrupt);
     48      // signal (SIGINT, handle_interrupt);
    4849      Nint = 0;
    4950      return;
    … …  
    5253
    5354}
     55
     56struct sigaction *SetInterrupt () {
     57
     58  struct sigaction  new_sigaction;
     59  struct sigaction *old_sigaction;
     60
     61  ALLOCATE (old_sigaction, struct sigaction, 1);
     62
     63  new_sigaction.sa_handler = handle_interrupt;
     64  new_sigaction.sa_flags = 0;
     65
     66  int sigstat = sigaction (SIGINT, &new_sigaction, old_sigaction);
     67  if (sigstat) {
     68    perror ("failed to set signal handler: ");
     69    free (old_sigaction);
     70    return NULL;
     71  }
     72
     73  interrupt = FALSE;
     74  return old_sigaction;
     75}
     76
     77int ClearInterrupt (struct sigaction *old_sigaction) {
     78
     79  // interrupt = FALSE;
     80
     81  if (!old_sigaction) return TRUE;
     82
     83  struct sigaction new_sigaction;
     84
     85  if (sigaction (SIGINT, old_sigaction, &new_sigaction)) {
     86    perror ("failed to reset signal handler: ");
     87    FREE (old_sigaction);
     88    return FALSE;
     89  }
     90  FREE (old_sigaction);
     91
     92  return TRUE;
     93}

  • branches/eam_branches/ohana.20160226/src/opihi/lib.shell/macro_edit.c

    r7917 r39419  
    22
    33int macro_edit (int argc, char **argv) {
     4  OHANA_UNUSED_PARAM(argc);
     5  OHANA_UNUSED_PARAM(argv);
    46
    57  gprint (GP_ERR, "this function is not implemented yet\n");

  • branches/eam_branches/ohana.20160226/src/opihi/lib.shell/macro_read.c

    r7917 r39419  
    22
    33int macro_read (int argc, char **argv) {
     4  OHANA_UNUSED_PARAM(argc);
     5  OHANA_UNUSED_PARAM(argv);
    46
    57  gprint (GP_ERR, "this function is not implemented yet\n");

  • branches/eam_branches/ohana.20160226/src/opihi/lib.shell/macro_write.c

    r7917 r39419  
    22
    33int macro_write (int argc, char **argv) {
     4  OHANA_UNUSED_PARAM(argc);
     5  OHANA_UNUSED_PARAM(argv);
    46
    57  gprint (GP_ERR, "this function is not implemented yet\n");

  • branches/eam_branches/ohana.20160226/src/opihi/lib.shell/multicommand.c

    r32632 r39419  
    6565  done = FALSE;
    6666  status = TRUE;
     67  interrupt = FALSE;
    6768  while (!done) {
    6869    q = strchr (p, ';');

  • branches/eam_branches/ohana.20160226/src/opihi/mana/mana.c.in

    r16448 r39419  
    99/* program-dependent initialization */
    1010void program_init (int *argc, char **argv) {
     11  OHANA_UNUSED_PARAM(argc);
     12  OHANA_UNUSED_PARAM(argv);
    1113 
    1214  auto_break = TRUE;

  • branches/eam_branches/ohana.20160226/src/opihi/mana/version.c

    r8653 r39419  
    33
    44int version (int argc, char **argv) {
     5  OHANA_UNUSED_PARAM(argc);
     6  OHANA_UNUSED_PARAM(argv);
    57
    68  char *tmp;

  • branches/eam_branches/ohana.20160226/src/opihi/pantasks/ListenClients.c

    r27435 r39419  
    6868/* select for messages from the current clients; wait for 0.5s before updating client list */
    6969void *ListenClients (void *data) {
     70  OHANA_UNUSED_PARAM(data);
    7071 
    7172  int i, Ncurrent, Nmax, status, Nread;

  • branches/eam_branches/ohana.20160226/src/opihi/pantasks/controller_machines.c

    r26411 r39419  
    22
    33int controller_machines (int argc, char **argv) {
     4  OHANA_UNUSED_PARAM(argv);
    45
    56  int status;

  • branches/eam_branches/ohana.20160226/src/opihi/pantasks/controller_threads.c

    r23530 r39419  
    1313
    1414void *CheckControllerThread (void *data) {
     15  OHANA_UNUSED_PARAM(data);
    1516
    1617  char log_stdout[128], log_stderr[128];

  • branches/eam_branches/ohana.20160226/src/opihi/pantasks/controller_version.c

    r26411 r39419  
    22
    33int controller_version (int argc, char **argv) {
     4  OHANA_UNUSED_PARAM(argv);
    45
    56  int status;

  • branches/eam_branches/ohana.20160226/src/opihi/pantasks/invalid.c

    r7917 r39419  
    22
    33int invalid (int argc, char **argv) {
     4  OHANA_UNUSED_PARAM(argc);
    45
    56  gprint (GP_ERR, "%s is not valid for the pantasks client\n", argv[0]);

  • branches/eam_branches/ohana.20160226/src/opihi/pantasks/jobs_and_tasks_thread.c

    r23530 r39419  
    2424
    2525void *CheckJobsAndTasksThread (void *data) {
     26  OHANA_UNUSED_PARAM(data);
    2627
    2728  char log_stdout[128], log_stderr[128];

  • branches/eam_branches/ohana.20160226/src/opihi/pantasks/pantasks.c.in

    r27996 r39419  
    99/* program-dependent initialization */
    1010void program_init (int *argc, char **argv) {
     11  OHANA_UNUSED_PARAM(argc);
     12  OHANA_UNUSED_PARAM(argv);
    1113 
    1214  pthread_t JobsAndTasksThread;

  • branches/eam_branches/ohana.20160226/src/opihi/pantasks/pantasks_client.c.in

    r16453 r39419  
    99/* program-dependent initialization */
    1010void program_init (int *argc, char **argv) {
     11  OHANA_UNUSED_PARAM(argc);
     12  OHANA_UNUSED_PARAM(argv);
    1113 
    1214  auto_break = TRUE;

  • branches/eam_branches/ohana.20160226/src/opihi/pantasks/pantasks_server.c.in

    r38986 r39419  
    149149/* these are needed to resolve symbols expected by libshell.so */
    150150void welcome () { }
    151 void program_init (int *argc, char **argv) {}
     151void program_init (int *argc, char **argv) {
     152  OHANA_UNUSED_PARAM(argc);
     153  OHANA_UNUSED_PARAM(argv);
     154}
    152155
    153156// I need to do things in a different order here to have config / freopen / gprint sequenced correctly

  • branches/eam_branches/ohana.20160226/src/opihi/pantasks/run.c

    r11084 r39419  
    99
    1010int run (int argc, char **argv) {
     11  OHANA_UNUSED_PARAM(argv);
    1112
    1213  if (argc != 1) {

  • branches/eam_branches/ohana.20160226/src/opihi/pantasks/server_connect.c

    r16903 r39419  
    22
    33int server_connect (int argc, char **argv) {
     4  OHANA_UNUSED_PARAM(argv);
    45
    56  int server;

  • branches/eam_branches/ohana.20160226/src/opihi/pantasks/server_disconnect.c

    r16903 r39419  
    22
    33int server_disconnect (int argc, char **argv) {
     4  OHANA_UNUSED_PARAM(argv);
    45
    56  int server;

  • branches/eam_branches/ohana.20160226/src/opihi/pantasks/server_run.c

    r23530 r39419  
    22
    33int server_run (int argc, char **argv) {
     4  OHANA_UNUSED_PARAM(argv);
    45
    56  if (argc != 1) {
    … …  
    1516
    1617int server_stop (int argc, char **argv) {
     18  OHANA_UNUSED_PARAM(argv);
    1719
    1820  if (argc != 1) {
    … …  
    2628
    2729int server_halt (int argc, char **argv) {
     30  OHANA_UNUSED_PARAM(argv);
    2831
    2932  if (argc != 1) {

  • branches/eam_branches/ohana.20160226/src/opihi/pantasks/stop.c

    r11084 r39419  
    22
    33int stop (int argc, char **argv) {
     4  OHANA_UNUSED_PARAM(argv);
    45
    56  if (argc != 1) {
    … …  
    1617
    1718int halt (int argc, char **argv) {
     19  OHANA_UNUSED_PARAM(argv);
    1820
    1921  if (argc != 1) {

  • branches/eam_branches/ohana.20160226/src/opihi/pantasks/thread_locks.c

    r27435 r39419  
    2929
    3030void ControlLock (const char *func) {
     31  OHANA_UNUSED_PARAM(func);
    3132  // fprintf (stderr, "control lock %s\n", func);
    3233  pthread_mutex_lock (&ControlMutex);
    … …  
    3435
    3536void ControlUnlock (const char *func) {
     37  OHANA_UNUSED_PARAM(func);
    3638  // fprintf (stderr, "control unlock %s\n", func);
    3739  pthread_mutex_unlock (&ControlMutex);

  • branches/eam_branches/ohana.20160226/src/opihi/pantasks/version.c

    r8176 r39419  
    33
    44int version (int argc, char **argv) {
     5  OHANA_UNUSED_PARAM(argc);
     6  OHANA_UNUSED_PARAM(argv);
    57
    68  char *tmp;

  • branches/eam_branches/ohana.20160226/src/opihi/pclient/check.c

    r3187 r39419  
    22
    33int check (int argc, char **argv) {
     4  OHANA_UNUSED_PARAM(argc);
     5  OHANA_UNUSED_PARAM(argv);
    46
    57  /* force a check */

  • branches/eam_branches/ohana.20160226/src/opihi/pclient/pclient.c.in

    r26891 r39419  
    88
    99void dummy_prep_term (int flag) {
     10  OHANA_UNUSED_PARAM(flag);
    1011}
    1112
    1213/* program-dependent initialization */
    1314void program_init (int *argc, char **argv) {
     15  OHANA_UNUSED_PARAM(argc);
     16  OHANA_UNUSED_PARAM(argv);
    1417 
    1518  auto_break = TRUE;
    … …  
    8083
    8184void pipe_signal (int signum) {
     85  OHANA_UNUSED_PARAM(signum);
     86
    8287  Npipe ++;
    8388  if (Npipe > 100) {

  • branches/eam_branches/ohana.20160226/src/opihi/pclient/reset.c

    r20047 r39419  
    22
    33int reset (int argc, char **argv) {
     4  OHANA_UNUSED_PARAM(argv);
    45
    56  int i, result, waitstatus;

  • branches/eam_branches/ohana.20160226/src/opihi/pclient/status.c

    r7917 r39419  
    22
    33int status (int argc, char **argv) {
     4  OHANA_UNUSED_PARAM(argv);
    45
    56  char status_string[64];

  • branches/eam_branches/ohana.20160226/src/opihi/pclient/stdout.c

    r7917 r39419  
    22
    33int stdout_pclient (int argc, char **argv) {
     4  OHANA_UNUSED_PARAM(argv);
    45
    56  if (argc != 1) {
    … …  
    1617
    1718int stderr_pclient (int argc, char **argv) {
     19  OHANA_UNUSED_PARAM(argv);
    1820
    1921  if (argc != 1) {

  • branches/eam_branches/ohana.20160226/src/opihi/pclient/version.c

    r8176 r39419  
    33
    44int version (int argc, char **argv) {
     5  OHANA_UNUSED_PARAM(argc);
     6  OHANA_UNUSED_PARAM(argv);
    57
    68  char *tmp;

  • branches/eam_branches/ohana.20160226/src/opihi/pcontrol/CheckSystem.c

    r34088 r39419  
    6161
    6262void *CheckSystem_Threaded (void *data) {
     63  OHANA_UNUSED_PARAM(data);
    6364
    6465  int Njobchecks, Nhostchecks, Ndonejobs;

  • branches/eam_branches/ohana.20160226/src/opihi/pcontrol/JobOps.c

    r36623 r39419  
    208208
    209209IDtype AddJob (char *hostname, JobMode mode, int timeout, int nicelevel, int argc, char **argv, int Nxhosts, char **xhosts) {
     210  OHANA_UNUSED_PARAM(timeout);
    210211
    211212  int JobID;
    … …  
    215216
    216217  job[0].JobID    = NextJobID();
    217   if (job[0].JobID < 0) {
    218     free (job);
    219     return -1;
    220   }
     218  // XXX this test does not make sense
     219  // if (job[0].JobID < 0) {
     220  //   free (job);
     221  //   return -1;
     222  // }
    221223
    222224  job[0].argc     = argc;

  • branches/eam_branches/ohana.20160226/src/opihi/pcontrol/MachineOps.c

    r29540 r39419  
    7474// delete a new machine (if not new, return TRUE)
    7575int DelMachine (char *name) {
     76  OHANA_UNUSED_PARAM(name);
    7677
    7778  return TRUE;

  • branches/eam_branches/ohana.20160226/src/opihi/pcontrol/StackOps.c

    r16458 r39419  
    1616
    1717  if (!DEBUG) return;
    18   fprintf (stderr, "%s: %p  ", func, stack);
    19   fprintf (stderr, "objects: %p  ", stack[0].object);
     18  fprintf (stderr, "%s: %p  ", func, (void *) stack);
     19  fprintf (stderr, "objects: %p  ", (void *) stack[0].object);
    2020  fprintf (stderr, "Nobjects: %d, NOBJECTS: %d\n", stack[0].Nobject, stack[0].NOBJECT);
    2121}

  • branches/eam_branches/ohana.20160226/src/opihi/pcontrol/machines.c

    r26411 r39419  
    22
    33int machines (int argc, char **argv) {
     4  OHANA_UNUSED_PARAM(argc);
     5  OHANA_UNUSED_PARAM(argv);
    46
    57  PrintMachines ();

  • branches/eam_branches/ohana.20160226/src/opihi/pcontrol/pcontrol.c.in

    r28158 r39419  
    1111/* program-dependent initialization */
    1212void program_init (int *argc, char **argv) {
     13  OHANA_UNUSED_PARAM(argc);
     14  OHANA_UNUSED_PARAM(argv);
    1315 
    1416# ifdef THREADED 

  • branches/eam_branches/ohana.20160226/src/opihi/pcontrol/version.c

    r8176 r39419  
    33
    44int version (int argc, char **argv) {
     5  OHANA_UNUSED_PARAM(argc);
     6  OHANA_UNUSED_PARAM(argv);
    57
    68  char *tmp;
Note: See TracChangeset for help on using the changeset viewer.