Changeset 4689 for trunk/Ohana/src/opihi/dvo/catalog.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/catalog.c (modified) (8 diffs)

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

@@ -76 +76 @@
   current_epoch = 2000.0;
   epoch = 2000.0;
-  if (N = get_argument (argc, argv, "-e")) {
+  if ((N = get_argument (argc, argv, "-e"))) {
     remove_argument (N, &argc, argv);
     epoch  = atof(argv[N]);
@@ -82 +82 @@
   }
 
+  IDchoice = 0;
   IDclip = FALSE;
-  if (N = get_argument (argc, argv, "-ID")) {
+  if ((N = get_argument (argc, argv, "-ID"))) {
     remove_argument (N, &argc, argv);
     IDchoice  = atof(argv[N]);
@@ -91 +92 @@
 
   LimExclude = FALSE;
-  if (N = get_argument (argc, argv, "-x")) {
+  if ((N = get_argument (argc, argv, "-x"))) {
     remove_argument (N, &argc, argv);
     LimExclude = TRUE;
   }
 
-  if (Nm = get_argument (argc, argv, "-m")) {
+  if ((Nm = get_argument (argc, argv, "-m"))) {
     remove_argument (Nm, &argc, argv);
     Mr  = 1000*atof(argv[Nm]);
@@ -105 +106 @@
   }
 
-  if (Nn = get_argument (argc, argv, "+n")) {
+  if ((Nn = get_argument (argc, argv, "+n"))) {
     remove_argument (Nn, &argc, argv);
     Nz  = atof(argv[Nn]);
@@ -113 +114 @@
   }
 
-  if (Nn = get_argument (argc, argv, "-n")) {
+  if ((Nn = get_argument (argc, argv, "-n"))) {
     remove_argument (Nn, &argc, argv);
     Nz  = atof(argv[Nn]);
@@ -122 +123 @@
 
   InRegion = FALSE;
-  if (N = get_argument (argc, argv, "-all")) {
+  if ((N = get_argument (argc, argv, "-all"))) {
     remove_argument (N, &argc, argv);
     InRegion = TRUE;
   }
 
+  Bytes_Star = 0;
   ASCII = FALSE;
   DVO = TRUE;
   GSC = FALSE;
   FIXED = FALSE;
-  if (N = get_argument (argc, argv, "-g")) {
+  if ((N = get_argument (argc, argv, "-g"))) {
     remove_argument (N, &argc, argv);
     GSC = TRUE;
@@ -138 +140 @@
   }
 
-  if (N = get_argument (argc, argv, "-a")) {
+  if ((N = get_argument (argc, argv, "-a"))) {
     remove_argument (N, &argc, argv);
     ASCII = TRUE;
@@ -149 +151 @@
     Am = atof(argv[N]);
     remove_argument (N, &argc, argv);
-    if (N = get_argument (argc, argv, "-f")) {
+    if ((N = get_argument (argc, argv, "-f"))) {
       remove_argument (N, &argc, argv);
       FIXED = TRUE;