Changeset 11084 for trunk/Ohana/src/opihi/lib.shell/variable.c

Timestamp:

Jan 12, 2007, 4:26:31 PM (19 years ago)

Author:

eugene

Message:

added module system; added panstarrs user features; panstarrs threaded

File:

• trunk/Ohana/src/opihi/lib.shell/variable.c (modified) (2 diffs)

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

@@ -244 +244 @@
 }
 
-double get_double_variable (char *name) {
-  
-  int i;
-  char *local, *MacroName;
-
-  MacroName = GetMacroName ();
-
-  /* look for local variable first */
-  ALLOCATE (local, char, strlen(name) + strlen(MacroName) + 2);
-  sprintf (local, "%s.%s", MacroName, name);
-  for (i = 0; i < Nvariables; i++) { /* find the variable mentioned */
-    if (!strcmp(local, variables[i].name)) {
-      free (local);
+double get_double_variable (char *name, int *found) {
+  
+  int i;
+  char *local, *MacroName;
+
+  MacroName = GetMacroName ();
+
+  /* look for local variable first */
+  ALLOCATE (local, char, strlen(name) + strlen(MacroName) + 2);
+  sprintf (local, "%s.%s", MacroName, name);
+  for (i = 0; i < Nvariables; i++) { /* find the variable mentioned */
+    if (!strcmp(local, variables[i].name)) {
+      free (local);
+      *found = TRUE;
       return (atof (variables[i].value));
     }
@@ -265 +266 @@
   for (i = 0; i < Nvariables; i++) { /* find the variable mentioned */
     if (!strcmp(name, variables[i].name)) {
+      *found = TRUE;
       return (atof (variables[i].value));
     }
   }
+  *found = FALSE;
+  return (0.0);
+}
+
+int get_int_variable (char *name, int *found) {
+  
+  int i;
+  char *local, *MacroName;
+
+  MacroName = GetMacroName ();
+
+  /* look for local variable first */
+  ALLOCATE (local, char, strlen(name) + strlen(MacroName) + 2);
+  sprintf (local, "%s.%s", MacroName, name);
+  for (i = 0; i < Nvariables; i++) { /* find the variable mentioned */
+    if (!strcmp(local, variables[i].name)) {
+      *found = TRUE;
+      free (local);
+      return (atof (variables[i].value));
+    }
+  }
+  free (local);
+
+  /* look for global variable */
+  for (i = 0; i < Nvariables; i++) { /* find the variable mentioned */
+    if (!strcmp(name, variables[i].name)) {
+      *found = TRUE;
+      return (atof (variables[i].value));
+    }
+  }
+  *found = FALSE;
   return (0.0);
 }