From 874b685a83a401774526f2bfddb83aedc3b7f821 Mon Sep 17 00:00:00 2001 From: Tom Ritchford Date: Thu, 25 Jun 2015 14:03:49 -0400 Subject: [PATCH] Remove duplicate and shadow variables. --- beast/module/core/native/linux_Files.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/beast/module/core/native/linux_Files.cpp b/beast/module/core/native/linux_Files.cpp index b465848acc..c0e54b9d54 100644 --- a/beast/module/core/native/linux_Files.cpp +++ b/beast/module/core/native/linux_Files.cpp @@ -63,8 +63,7 @@ File File::getSpecialLocation (const SpecialLocationType type) case userHomeDirectory: { const char* homeDir = getenv ("HOME"); - - if (const char* homeDir = getenv ("HOME")) + if (homeDir) return File (CharPointer_UTF8 (homeDir)); if (struct passwd* const pw = getpwuid (getuid())) @@ -166,8 +165,8 @@ private: DIR* dir; }; -DirectoryIterator::NativeIterator::NativeIterator (const File& directory, const String& wildCard) - : pimpl (new DirectoryIterator::NativeIterator::Pimpl (directory, wildCard)) +DirectoryIterator::NativeIterator::NativeIterator (const File& directory, const String& wildCard_) + : pimpl (new DirectoryIterator::NativeIterator::Pimpl (directory, wildCard_)) { }