aboutsummaryrefslogtreecommitdiffstats
path: root/expr.c
diff options
context:
space:
mode:
authorreinelt <>2004-01-12 03:51:01 +0000
committerreinelt <>2004-01-12 03:51:01 +0000
commit3d4765569e009b6bb02add493d5abfe727709ec5 (patch)
tree1ba1b8f86e9e0487f44f37c657997bc3b0055a43 /expr.c
parent81017f73686edcfdb61be27996f8001182cc8c98 (diff)
downloadlcd4linux-3d4765569e009b6bb02add493d5abfe727709ec5.tar.gz
[lcd4linux @ 2004-01-12 03:51:01 by reinelt]
evaluating the 'Variables' section in the config file
Diffstat (limited to 'expr.c')
-rw-r--r--expr.c20
1 files changed, 13 insertions, 7 deletions
diff --git a/expr.c b/expr.c
index 2464a99..1b1c5b7 100644
--- a/expr.c
+++ b/expr.c
@@ -1,4 +1,4 @@
-/* $Id: expr.c,v 1.2 2004/01/09 04:16:06 reinelt Exp $
+/* $Id: expr.c,v 1.3 2004/01/12 03:51:01 reinelt Exp $
*
* expr ('y*') functions
* This is only a workaround to make the Evaluator usable until
@@ -24,6 +24,9 @@
*
*
* $Log: expr.c,v $
+ * Revision 1.3 2004/01/12 03:51:01 reinelt
+ * evaluating the 'Variables' section in the config file
+ *
* Revision 1.2 2004/01/09 04:16:06 reinelt
* added 'section' argument to cfg_get(), but NULLed it on all calls by now.
*
@@ -45,9 +48,9 @@
#include "cfg.h"
-int Expr(int index, char result[EXPR_TXT_LEN], double *val)
+int Expr(int index, char string[EXPR_TXT_LEN], double *val)
{
- RESULT Result = {0, 0.0, NULL};
+ RESULT result = {0, 0.0, NULL};
static int errs[EXPRS+1];
char *expression;
char yn[4];
@@ -67,14 +70,14 @@ int Expr(int index, char result[EXPR_TXT_LEN], double *val)
return -1;
}
- Eval(expression, &Result);
- strcpy(result, R2S(&Result));
+ Eval(expression, &result);
+ strcpy(string, R2S(&result));
debug("%s: <%s> = '%s'",yn, expression, result);
- if (isdigit(*result)) {
+ if (isdigit(*string)) {
double max, min;
- *val = atof(result);
+ *val = atof(string);
sprintf(yn, "Max_y%d", index);
max = atof(cfg_get(NULL, yn, "100"));
sprintf(yn, "Min_y%d", index);
@@ -82,6 +85,9 @@ int Expr(int index, char result[EXPR_TXT_LEN], double *val)
if (max != min)
*val = (*val - min)/(max - min);
}
+
+ DelResult (&result);
+
return 0;
}