]> granicus.if.org Git - graphviz/commitdiff
expr extokens: remove shadowing of 'expr' global
authorMatthew Fernandez <matthew.fernandez@gmail.com>
Wed, 4 Jan 2023 04:22:56 +0000 (20:22 -0800)
committerMatthew Fernandez <matthew.fernandez@gmail.com>
Sun, 8 Jan 2023 19:57:18 +0000 (11:57 -0800)
lib/expr/exeval.c

index 8795b5e81246161bdbf515e40793afdce05c4694..cf57217666bdf6af9bc78759eb2afc630c835f90 100644 (file)
@@ -897,19 +897,17 @@ static Extype_t exsplit(Expr_t *ex, Exnode_t *exnode, void *env) {
  * tokenize string and store in array
  * return number of tokens
  */
-static Extype_t
-extokens(Expr_t * ex, Exnode_t * expr, void *env)
-{
+static Extype_t extokens(Expr_t *ex, Exnode_t *exnode, void *env) {
        Extype_t v;
        char *str;
        char *seps;
        char *tok;
        size_t sz;
-       Dt_t* arr = (Dt_t*)expr->data.split.array->local.pointer;
+       Dt_t* arr = (Dt_t*)exnode->data.split.array->local.pointer;
 
-       str = eval(ex, expr->data.split.string, env).string;
-       if (expr->data.split.seps)
-               seps = eval(ex, expr->data.split.seps, env).string;
+       str = eval(ex, exnode->data.split.string, env).string;
+       if (exnode->data.split.seps)
+               seps = eval(ex, exnode->data.split.seps, env).string;
        else
                seps = " \t\n";