ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #12416 from lioncash/expr 

Externals/expr: Resolve -Wshadow warning
This commit is contained in:
Admiral H. Curtiss 2023-12-16 05:10:06 +01:00 committed by GitHub
parent 1daaaf8c26 5450b64951
commit 3ee44bc565
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Externals/expr/include/expr.h vendored
View File

@ -826,14 +826,14 @@ static struct expr *expr_create(const char *s, size_t len,
vec_push(&es, expr_const(num)); vec_push(&es, expr_const(num));
paren_next = EXPR_PAREN_FORBIDDEN; paren_next = EXPR_PAREN_FORBIDDEN;
} else if (n > 1 && *tok == '"') { } else if (n > 1 && *tok == '"') {
char *s = (char *)calloc(1, n - 1); char *str = (char *)calloc(1, n - 1);
if (s == NULL) { if (str == NULL) {
goto cleanup; /* allocation failed */ goto cleanup; /* allocation failed */
} }
strncpy(s, tok + 1, n - 2); strncpy(str, tok + 1, n - 2);
struct expr e = expr_init(); struct expr e = expr_init();
e.type = OP_STRING; e.type = OP_STRING;
e.param.str.s = s; e.param.str.s = str;
vec_push(&es, e); vec_push(&es, e);
paren_next = EXPR_PAREN_FORBIDDEN; paren_next = EXPR_PAREN_FORBIDDEN;
} else if (expr_op(tok, n, -1) != OP_UNKNOWN) { } else if (expr_op(tok, n, -1) != OP_UNKNOWN) {