Module: wine Branch: master Commit: 3631ee051ebbf4e54a2f7ab3ce135b127bf82a78 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3631ee051ebbf4e54a2f7ab3ce...
Author: Austin English austinenglish@gmail.com Date: Wed Mar 9 01:07:20 2011 -0800
cmd: Avoid shadowing a parameter.
---
programs/cmd/batch.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/programs/cmd/batch.c b/programs/cmd/batch.c index 585ea5e..f012eaf 100644 --- a/programs/cmd/batch.c +++ b/programs/cmd/batch.c @@ -399,14 +399,14 @@ void WCMD_HandleTildaModifiers(WCHAR **start, WCHAR *forVariable, WCHAR *forValu if (memchrW(firstModifier, '$', modifierLen) != NULL) { /* Special Case: Search envar specified in $[envvar] for outputparam 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 env[MAX_PATH]; WCHAR fullpath[MAX_PATH];
/* Extract the env var */ - memcpy(env, start, (end-start) * sizeof(WCHAR)); - env[(end-start)] = 0x00; + memcpy(env, begin, (end-begin) * sizeof(WCHAR)); + env[(end-begin)] = 0x00;
/* If env var not found, return empty string */ if ((GetEnvironmentVariableW(env, fullpath, MAX_PATH) == 0) ||