Skip to content

W
wine-winehq
Commit 3631ee05 authored by Austin English's avatar Austin English Committed by Alexandre Julliard
Browse files
Options

cmd: Avoid shadowing a parameter.

parent 38a87ecf
Show whitespace changes
Inline Side-by-side
Showing with 3 additions and 3 deletions
programs/cmd/batch.c
View file @ 3631ee05
...@@ -399,14 +399,14 @@ void WCMD_HandleTildaModifiers(WCHAR **start, WCHAR *forVariable, WCHAR *forValu ...@@ -399,14 +399,14 @@ void WCMD_HandleTildaModifiers(WCHAR **start, WCHAR *forVariable, WCHAR *forValu
if (memchrW(firstModifier, '$', modifierLen) != NULL) { if (memchrW(firstModifier, '$', modifierLen) != NULL) {
/* Special Case: Search envar specified in $[envvar] for outputparam /* Special Case: Search envar specified in $[envvar] for outputparam
Note both $ and : are guaranteed otherwise check above would fail */ Note both $ and : are guaranteed otherwise check above would fail */
WCHAR *start = strchrW(firstModifier, '$') + 1; WCHAR *begin = strchrW(firstModifier, '$') + 1;
WCHAR *end = strchrW(firstModifier, ':'); WCHAR *end = strchrW(firstModifier, ':');
WCHAR env[MAX_PATH]; WCHAR env[MAX_PATH];
WCHAR fullpath[MAX_PATH]; WCHAR fullpath[MAX_PATH];
/* Extract the env var */ /* Extract the env var */
memcpy(env, start, (end-start) * sizeof(WCHAR)); memcpy(env, begin, (end-begin) * sizeof(WCHAR));
env[(end-start)] = 0x00; env[(end-begin)] = 0x00;
/* If env var not found, return empty string */ /* If env var not found, return empty string */
if ((GetEnvironmentVariableW(env, fullpath, MAX_PATH) == 0) || if ((GetEnvironmentVariableW(env, fullpath, MAX_PATH) == 0) ||
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment