Remove duplicate and shadow variables.

This commit is contained in:
Tom Ritchford
2015-06-25 14:03:49 -04:00
committed by Vinnie Falco
parent ea5fe35b54
commit 874b685a83

View File

@@ -63,8 +63,7 @@ File File::getSpecialLocation (const SpecialLocationType type)
case userHomeDirectory: case userHomeDirectory:
{ {
const char* homeDir = getenv ("HOME"); const char* homeDir = getenv ("HOME");
if (homeDir)
if (const char* homeDir = getenv ("HOME"))
return File (CharPointer_UTF8 (homeDir)); return File (CharPointer_UTF8 (homeDir));
if (struct passwd* const pw = getpwuid (getuid())) if (struct passwd* const pw = getpwuid (getuid()))
@@ -166,8 +165,8 @@ private:
DIR* dir; DIR* dir;
}; };
DirectoryIterator::NativeIterator::NativeIterator (const File& directory, const String& wildCard) DirectoryIterator::NativeIterator::NativeIterator (const File& directory, const String& wildCard_)
: pimpl (new DirectoryIterator::NativeIterator::Pimpl (directory, wildCard)) : pimpl (new DirectoryIterator::NativeIterator::Pimpl (directory, wildCard_))
{ {
} }