Use static instead of an anonymous namespace.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@201983 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Rafael Espindola
2014-02-23 15:16:03 +00:00
parent 73f1a5fe45
commit da6ffb33d2
2 changed files with 31 additions and 35 deletions

View File

@@ -85,24 +85,22 @@ namespace {
operator int() const {return FileDescriptor;} operator int() const {return FileDescriptor;}
}; };
}
error_code TempDir(SmallVectorImpl<char> &result) { static error_code TempDir(SmallVectorImpl<char> &result) {
// FIXME: Don't use TMPDIR if program is SUID or SGID enabled. // FIXME: Don't use TMPDIR if program is SUID or SGID enabled.
const char *dir = 0; const char *dir = 0;
(dir = std::getenv("TMPDIR" )) || (dir = std::getenv("TMPDIR")) || (dir = std::getenv("TMP")) ||
(dir = std::getenv("TMP" )) || (dir = std::getenv("TEMP")) || (dir = std::getenv("TEMPDIR")) ||
(dir = std::getenv("TEMP" )) ||
(dir = std::getenv("TEMPDIR")) ||
#ifdef P_tmpdir #ifdef P_tmpdir
(dir = P_tmpdir) || (dir = P_tmpdir) ||
#endif #endif
(dir = "/tmp"); (dir = "/tmp");
result.clear(); result.clear();
StringRef d(dir); StringRef d(dir);
result.append(d.begin(), d.end()); result.append(d.begin(), d.end());
return error_code::success(); return error_code::success();
}
} }
static error_code createUniqueEntity(const Twine &Model, int &ResultFD, static error_code createUniqueEntity(const Twine &Model, int &ResultFD,

View File

@@ -44,31 +44,29 @@ using namespace llvm;
using llvm::sys::windows::UTF8ToUTF16; using llvm::sys::windows::UTF8ToUTF16;
using llvm::sys::windows::UTF16ToUTF8; using llvm::sys::windows::UTF16ToUTF8;
namespace { static error_code TempDir(SmallVectorImpl<wchar_t> &result) {
error_code TempDir(SmallVectorImpl<wchar_t> &result) { retry_temp_dir:
retry_temp_dir: DWORD len = ::GetTempPathW(result.capacity(), result.begin());
DWORD len = ::GetTempPathW(result.capacity(), result.begin());
if (len == 0) if (len == 0)
return windows_error(::GetLastError()); return windows_error(::GetLastError());
if (len > result.capacity()) { if (len > result.capacity()) {
result.reserve(len); result.reserve(len);
goto retry_temp_dir; goto retry_temp_dir;
}
result.set_size(len);
return error_code::success();
} }
bool is_separator(const wchar_t value) { result.set_size(len);
switch (value) { return error_code::success();
case L'\\': }
case L'/':
return true; static bool is_separator(const wchar_t value) {
default: switch (value) {
return false; case L'\\':
} case L'/':
return true;
default:
return false;
} }
} }