Changeset 4689 for trunk/Ohana/src/opihi/dvo/imrough.c

Timestamp:

Jul 31, 2005, 1:04:22 PM (21 years ago)

Author:

eugene

Message:

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

File:

• trunk/Ohana/src/opihi/dvo/imrough.c (modified) (7 diffs)

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

@@ -6 +6 @@
 static 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"};
 
-imrough (int argc, char **argv) {
+int imrough (int argc, char **argv) {
  
   int i, N, Nimage, TimeSelect;
@@ -21 +21 @@
 
   TimeSelect = FALSE;
-  if (N = get_argument (argc, argv, "-time")) {
+  if ((N = get_argument (argc, argv, "-time"))) {
     remove_argument (N, &argc, argv);
     if (!str_to_time (argv[N], &tzero)) { 
@@ -39 +39 @@
     TimeSelect = TRUE;
   }
-  if (N = get_argument (argc, argv, "-trange")) {
+  if ((N = get_argument (argc, argv, "-trange"))) {
     remove_argument (N, &argc, argv);
     if (!str_to_time (argv[N], &tzero)) { 
@@ -61 +61 @@
   type = T_UNDEF;
   TypeSelect = FALSE;
-  if (N = get_argument (argc, argv, "-type")) {
+  if ((N = get_argument (argc, argv, "-type"))) {
     TypeSelect = TRUE;
     remove_argument (N, &argc, argv);
@@ -74 +74 @@
   mode = M_NONE;
   ModeSelect = FALSE;
-  if (N = get_argument (argc, argv, "-mode")) {
+  if ((N = get_argument (argc, argv, "-mode"))) {
     ModeSelect = TRUE;
     remove_argument (N, &argc, argv);
@@ -85 +85 @@
   }
 
+  CCD = 0;
   CCDSelect = FALSE;
-  if (N = get_argument (argc, argv, "-ccd")) {
+  if ((N = get_argument (argc, argv, "-ccd"))) {
     remove_argument (N, &argc, argv);
     CCD = atoi (argv[N]);
@@ -93 +94 @@
   }
  
+  Filter = NULL;
   FilterSelect = FALSE;
-  if (N = get_argument (argc, argv, "-filter")) {
+  if ((N = get_argument (argc, argv, "-filter"))) {
     remove_argument (N, &argc, argv);
     Filter = strcreate (argv[N]);