diff options
author | David Tardon <dtardon@redhat.com> | 2012-03-07 12:52:20 +0100 |
---|---|---|
committer | David Tardon <dtardon@redhat.com> | 2012-03-07 14:01:29 +0100 |
commit | a6b12b7408b7e2378365f942d100e9038051b0aa (patch) | |
tree | ff4dfca078fa5274ccf7abf192329aa881f0f23e /sal | |
parent | WaE: ordered comparison of pointer with integer zero (diff) | |
download | core-a6b12b7408b7e2378365f942d100e9038051b0aa.tar.gz core-a6b12b7408b7e2378365f942d100e9038051b0aa.zip |
WaE: declaration of 'n' shadows a previous local
Diffstat (limited to 'sal')
-rw-r--r-- | sal/osl/w32/profile.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sal/osl/w32/profile.cxx b/sal/osl/w32/profile.cxx index 1a019d073263..77abc77c5c84 100644 --- a/sal/osl/w32/profile.cxx +++ b/sal/osl/w32/profile.cxx @@ -2302,11 +2302,11 @@ static sal_Bool lookupProfile(const sal_Unicode *strPath, const sal_Unicode *str else { ::osl::LongPathBuffer< sal_Char > aTmpPath( MAX_LONG_PATH ); - int n; + int nLen = 0; - if ((n = WideCharToMultiByte(CP_ACP,0, ::osl::mingw_reinterpret_cast<LPCWSTR>(aPath), -1, aTmpPath, aTmpPath.getBufSizeInSymbols(), NULL, NULL)) > 0) + if ((nLen = WideCharToMultiByte(CP_ACP,0, ::osl::mingw_reinterpret_cast<LPCWSTR>(aPath), -1, aTmpPath, aTmpPath.getBufSizeInSymbols(), NULL, NULL)) > 0) { - strcpy(aTmpPath + n, SVERSION_USER); + strcpy(aTmpPath + nLen, SVERSION_USER); if (access(aTmpPath, 0) >= 0) { dwPathLen += MultiByteToWideChar( CP_ACP, 0, SVERSION_USER, -1, reinterpret_cast<LPWSTR>(aPath + dwPathLen), aPath.getBufSizeInSymbols() - dwPathLen ); |