Index: trunk/Ohana/src/opihi/cmd.data/book_commands.c
===================================================================
--- trunk/Ohana/src/opihi/cmd.data/book_commands.c	(revision 39360)
+++ trunk/Ohana/src/opihi/cmd.data/book_commands.c	(revision 39457)
@@ -2,4 +2,5 @@
 
 int book_list (int argc, char **argv) {
+  OHANA_UNUSED_PARAM(argv);
   if (argc != 1) {
     gprint (GP_ERR, "USAGE: book list\n");
Index: trunk/Ohana/src/opihi/cmd.data/cursor.c
===================================================================
--- trunk/Ohana/src/opihi/cmd.data/cursor.c	(revision 39360)
+++ trunk/Ohana/src/opihi/cmd.data/cursor.c	(revision 39457)
@@ -6,5 +6,4 @@
   int i, N, kapa, VERBOSE;
   double X, Y, R, D, Z;
-  void *oldsignal;
 
   // XXX need to be able to specify graph vs image coords
@@ -38,7 +37,5 @@
   KiiCursorOn (kapa);
   
-  oldsignal = signal (SIGINT, handle_interrupt);
-  interrupt = FALSE;
-
+  struct sigaction *old_sigaction = SetInterrupt();
   for (i = 0; ((i < N) || (N == 0)) && !interrupt; i++) {
 
@@ -62,6 +59,6 @@
     if (!strcasecmp (key, "Q")) break;
   }
+  ClearInterrupt (old_sigaction);
 
-  signal (SIGINT, oldsignal);
   KiiCursorOff (kapa);
   return (TRUE);
Index: trunk/Ohana/src/opihi/cmd.data/gaussdeviate.c
===================================================================
--- trunk/Ohana/src/opihi/cmd.data/gaussdeviate.c	(revision 39360)
+++ trunk/Ohana/src/opihi/cmd.data/gaussdeviate.c	(revision 39457)
@@ -30,4 +30,6 @@
 
 int gaussintegral (int argc, char **argv) {
+  OHANA_UNUSED_PARAM(argc);
+  OHANA_UNUSED_PARAM(argv);
   
   gprint (GP_ERR, "fix gaussintegral\n");
Index: trunk/Ohana/src/opihi/cmd.data/list_buffers.c
===================================================================
--- trunk/Ohana/src/opihi/cmd.data/list_buffers.c	(revision 39360)
+++ trunk/Ohana/src/opihi/cmd.data/list_buffers.c	(revision 39457)
@@ -2,4 +2,5 @@
 
 int list_buffers (int argc, char **argv) {
+  OHANA_UNUSED_PARAM(argv);
 
   if (argc == 3) PrintBuffers (TRUE);
Index: trunk/Ohana/src/opihi/cmd.data/list_vectors.c
===================================================================
--- trunk/Ohana/src/opihi/cmd.data/list_vectors.c	(revision 39360)
+++ trunk/Ohana/src/opihi/cmd.data/list_vectors.c	(revision 39457)
@@ -2,4 +2,6 @@
 
 int list_vectors (int argc, char **argv) {
+  OHANA_UNUSED_PARAM(argc);
+  OHANA_UNUSED_PARAM(argv);
 
   ListVectors ();
Index: trunk/Ohana/src/opihi/cmd.data/medimage.c
===================================================================
--- trunk/Ohana/src/opihi/cmd.data/medimage.c	(revision 39360)
+++ trunk/Ohana/src/opihi/cmd.data/medimage.c	(revision 39457)
@@ -18,4 +18,6 @@
 
 int medimage_help (int argc, char **argv) {
+  OHANA_UNUSED_PARAM(argc);
+  OHANA_UNUSED_PARAM(argv);
 
   gprint (GP_ERR, "USAGE: medimage (command)\n");
Index: trunk/Ohana/src/opihi/cmd.data/medimage_commands.c
===================================================================
--- trunk/Ohana/src/opihi/cmd.data/medimage_commands.c	(revision 39360)
+++ trunk/Ohana/src/opihi/cmd.data/medimage_commands.c	(revision 39457)
@@ -2,4 +2,6 @@
 
 int medimage_list (int argc, char **argv) {
+  OHANA_UNUSED_PARAM(argv);
+
   if (argc != 1) {
     gprint (GP_ERR, "USAGE: medimage list\n");
Index: trunk/Ohana/src/opihi/cmd.data/queuelist.c
===================================================================
--- trunk/Ohana/src/opihi/cmd.data/queuelist.c	(revision 39360)
+++ trunk/Ohana/src/opihi/cmd.data/queuelist.c	(revision 39457)
@@ -2,4 +2,5 @@
 
 int queuelist (int argc, char **argv) {
+  OHANA_UNUSED_PARAM(argv);
   
   if (argc != 1) {
Index: trunk/Ohana/src/opihi/cmd.data/spline.c
===================================================================
--- trunk/Ohana/src/opihi/cmd.data/spline.c	(revision 39360)
+++ trunk/Ohana/src/opihi/cmd.data/spline.c	(revision 39457)
@@ -23,4 +23,6 @@
 
 int spline_help (int argc, char **argv) {
+  OHANA_UNUSED_PARAM(argc);
+  OHANA_UNUSED_PARAM(argv);
 
   gprint (GP_ERR, "USAGE: spline (command)\n");
Index: trunk/Ohana/src/opihi/cmd.data/spline_commands.c
===================================================================
--- trunk/Ohana/src/opihi/cmd.data/spline_commands.c	(revision 39360)
+++ trunk/Ohana/src/opihi/cmd.data/spline_commands.c	(revision 39457)
@@ -2,4 +2,6 @@
 
 int spline_list (int argc, char **argv) {
+  OHANA_UNUSED_PARAM(argv);
+
   if (argc != 1) {
     gprint (GP_ERR, "USAGE: spline list\n");
Index: trunk/Ohana/src/opihi/cmd.data/uniq.c
===================================================================
--- trunk/Ohana/src/opihi/cmd.data/uniq.c	(revision 39360)
+++ trunk/Ohana/src/opihi/cmd.data/uniq.c	(revision 39457)
@@ -56,6 +56,5 @@
     int onePercent = ivec->Nelements / 100;
 
-    void *Signal = signal (SIGINT, handle_interrupt);
-    interrupt = FALSE;
+    struct sigaction *old_sigaction = SetInterrupt();
     for (i = 0; (i < ivec->Nelements) && !interrupt; Nnew++) {
       vtgt[Nnew] = *vsrc;
@@ -72,5 +71,5 @@
       }
     }
-    signal (SIGINT, Signal);
+    ClearInterrupt (old_sigaction);
     if (VERBOSE) gprint (GP_ERR, "\n");
     free (indata);
@@ -90,6 +89,5 @@
     int onePercent = ivec->Nelements / 100;
 
-    void *Signal = signal (SIGINT, handle_interrupt);
-    interrupt = FALSE;
+    struct sigaction *old_sigaction = SetInterrupt();
     for (i = 0; (i < ivec->Nelements) && !interrupt; Nnew++) {
       vtgt[Nnew] = *vsrc;
@@ -106,5 +104,5 @@
       }
     }
-    signal (SIGINT, Signal);
+    ClearInterrupt (old_sigaction);
     if (VERBOSE) gprint (GP_ERR, "\n");
     free (indata);
Index: trunk/Ohana/src/opihi/cmd.data/vellipse.c
===================================================================
--- trunk/Ohana/src/opihi/cmd.data/vellipse.c	(revision 39360)
+++ trunk/Ohana/src/opihi/cmd.data/vellipse.c	(revision 39457)
@@ -230,4 +230,5 @@
 // XXX NOTE that PHI is defined with the wrong sign, should fix this...
 opihi_flt fellipseOD (opihi_flt alpha, opihi_flt *par, int Npar, opihi_flt *dpar) {
+  OHANA_UNUSED_PARAM(Npar);
   
   static int pass = 0;
Index: trunk/Ohana/src/opihi/cmd.data/vgauss.c
===================================================================
--- trunk/Ohana/src/opihi/cmd.data/vgauss.c	(revision 39360)
+++ trunk/Ohana/src/opihi/cmd.data/vgauss.c	(revision 39457)
@@ -127,4 +127,5 @@
 /* pars: x_o, sigma, I, back */
 opihi_flt fgaussOD (opihi_flt x, opihi_flt *par, int Npar, opihi_flt *dpar) {
+  OHANA_UNUSED_PARAM(Npar);
 
   opihi_flt z, r, f;
Index: trunk/Ohana/src/opihi/cmd.data/vmaxwell.c
===================================================================
--- trunk/Ohana/src/opihi/cmd.data/vmaxwell.c	(revision 39360)
+++ trunk/Ohana/src/opihi/cmd.data/vmaxwell.c	(revision 39457)
@@ -96,4 +96,5 @@
 // f = C3 + C2*(x - C4)^2 * exp(-0.5*(x - C0)^2 / C1^2)
 opihi_flt fmaxwellOD (opihi_flt x, opihi_flt *par, int Npar, opihi_flt *dpar) {
+  OHANA_UNUSED_PARAM(Npar);
 
   opihi_flt z, r, f;