Changeset 4833 for trunk/Ohana/src/opihi/lib.shell/ConfigInit.c

Timestamp:

Aug 19, 2005, 5:14:08 PM (21 years ago)

Author:

eugene

Message:

re-ordered -lFITS and -lohana to support fits_db calls

File:

• trunk/Ohana/src/opihi/lib.shell/ConfigInit.c (modified) (1 diff)

trunk/Ohana/src/opihi/lib.shell/ConfigInit.c

@@ -26 +26 @@
 
   answer = get_variable (keyword);
-  if (answer != (char *) NULL) {
-
-    if (!strcmp (mode, "%s")) {
-      strcpy ((char *) ptr, answer);
-    } else {
-      if (!strcmp (mode, "%d"))  *(int *) ptr       = atoi (answer);
-      if (!strcmp (mode, "%u"))  *(unsigned *) ptr  = atoi (answer);
-      if (!strcmp (mode, "%ld")) *(long *) ptr      = atoi (answer);
-      if (!strcmp (mode, "%hd")) *(short *) ptr     = atoi (answer);
-      if (!strcmp (mode, "%f"))  *(float *) ptr     = atof (answer);
-      if (!strcmp (mode, "%lf")) *(double *) ptr    = atof (answer);
-    }
-    free (answer);
-    return (ptr);
+  if (answer == (char *) NULL) {
+    answer = ScanConfig (GlobalConfig, keyword, mode, 0, ptr);
+    return (answer);
   }
 
-  answer = ScanConfig (GlobalConfig, keyword, mode, 0, ptr);
-  return (answer);
+  if (!strcmp (mode, "%s"))  strcpy ((char *) ptr, answer);
+  if (!strcmp (mode, "%d"))  *(int *) ptr       = atoi (answer);
+  if (!strcmp (mode, "%u"))  *(unsigned *) ptr  = atoi (answer);
+  if (!strcmp (mode, "%ld")) *(long *) ptr      = atoi (answer);
+  if (!strcmp (mode, "%hd")) *(short *) ptr     = atoi (answer);
+  if (!strcmp (mode, "%f"))  *(float *) ptr     = atof (answer);
+  if (!strcmp (mode, "%lf")) *(double *) ptr    = atof (answer);
+
+  free (answer);
+  return (ptr);
 }
-
-