Changeset 2843 for trunk/Ohana/src/opihi/cmd.data/cursor.c

Timestamp:

Dec 28, 2004, 8:40:04 PM (22 years ago)

Author:

eugene

Message:

fixes for -Wall -Werror (mostly get_argument lines)

File:

• trunk/Ohana/src/opihi/cmd.data/cursor.c (modified) (3 diffs)

trunk/Ohana/src/opihi/cmd.data/cursor.c

@@ -4 +4 @@
 
   char buffer[40], string[20], key;
-  int i, N, Nsource, Source, IsImage, oldsignal;
+  int i, N, Nsource, Source, IsImage;
   double X, Y, R, D, Z;
+  void *oldsignal;
   Graphdata graphmode;
   Buffer *buf;
 
   Nsource = -1;
-  if (N = get_argument (argc, argv, "-n")) {
+  if ((N = get_argument (argc, argv, "-n"))) {
     remove_argument (N, &argc, argv);
     Nsource = atof (argv[N]);
     remove_argument (N, &argc, argv);
   }
-  if (N = get_argument (argc, argv, "-g")) {
+  if ((N = get_argument (argc, argv, "-g"))) {
     remove_argument (N, &argc, argv);
     SetImageDevice (FALSE);
   }  
-  if (N = get_argument (argc, argv, "-i")) {
+  if ((N = get_argument (argc, argv, "-i"))) {
     remove_argument (N, &argc, argv);
     SetImageDevice (TRUE);
@@ -44 +45 @@
   write (Source, string, 4); /* ask Source to look for the keystrokes */
   
-  oldsignal = (int) signal (SIGINT, handle_interrupt);
+  oldsignal = signal (SIGINT, handle_interrupt);
   interrupt = FALSE;
   Z = -1.0;
@@ -86 +87 @@
   }
 
-  signal (SIGINT, (void *) oldsignal);
+  signal (SIGINT, oldsignal);
   write (Source, "NCUR", 4); /* ask Source to look for the keystrokes */
   return (TRUE);