c1eff85585566a80230f3fda73cff6810cfe244e kent Fri Aug 30 14:02:35 2019 -0700 Adjusting to new API that wants and extra parameter for context. diff --git src/utils/strexCalc/strexCalc.c src/utils/strexCalc/strexCalc.c index 29e71b0..1123dc0 100644 --- src/utils/strexCalc/strexCalc.c +++ src/utils/strexCalc/strexCalc.c @@ -12,37 +12,37 @@ errAbort( "strexCalc - String expression calculator, mostly to test strex expression evaluator.\n" "usage:\n" " strexCalc [variable assignments] expression\n" "command options in strexCalc are used to seed variables so for instance the command\n" " strexCalc a=12 b=13 c=xyz 'a + b + c'\n" "ends up returning 1213xyz\n" ); } char *symLookup(void *symbols, char *key) { return optionVal(key, NULL); } -void warnHandler(char *warning) +void warnHandler(void *symbols, char *warning) /* Print warning message */ { fprintf(stderr, "%s\n", warning); } -void abortHandler() +void abortHandler(void *symbols) /* Abort */ { errAbort("Aborting"); } void strexCalc(char *expression) /* strexCalc - String expression calculator, mostly to test strex expression evaluator.. */ { struct strexParse *parsed = strexParseString(expression, expression, 0, "options", symLookup); if (verboseLevel() > 1) strexParseDump(parsed, 0, stderr); char *result = strexEvalAsString(parsed, "options", symLookup, warnHandler, abortHandler); printf("%s\n", result); }