diff options
author | Rafael Espindola <rafael.espindola@gmail.com> | 2014-02-23 15:16:03 +0000 |
---|---|---|
committer | Rafael Espindola <rafael.espindola@gmail.com> | 2014-02-23 15:16:03 +0000 |
commit | da6ffb33d2bf42ff7f10dc1983123ea00f58840f (patch) | |
tree | 4da5c4209f444a2e9e74a9dfd724360ab45ea5e4 /lib/Support | |
parent | 73f1a5fe454c7de25b00425dd1ac60f01125b879 (diff) | |
download | llvm-da6ffb33d2bf42ff7f10dc1983123ea00f58840f.tar.gz llvm-da6ffb33d2bf42ff7f10dc1983123ea00f58840f.tar.bz2 llvm-da6ffb33d2bf42ff7f10dc1983123ea00f58840f.tar.xz |
Use static instead of an anonymous namespace.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@201983 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Support')
-rw-r--r-- | lib/Support/Unix/Path.inc | 26 | ||||
-rw-r--r-- | lib/Support/Windows/Path.inc | 40 |
2 files changed, 31 insertions, 35 deletions
diff --git a/lib/Support/Unix/Path.inc b/lib/Support/Unix/Path.inc index 83d2b4284a..e211ac9911 100644 --- a/lib/Support/Unix/Path.inc +++ b/lib/Support/Unix/Path.inc @@ -85,24 +85,22 @@ namespace { operator int() const {return FileDescriptor;} }; +} - error_code TempDir(SmallVectorImpl<char> &result) { - // FIXME: Don't use TMPDIR if program is SUID or SGID enabled. - const char *dir = 0; - (dir = std::getenv("TMPDIR" )) || - (dir = std::getenv("TMP" )) || - (dir = std::getenv("TEMP" )) || - (dir = std::getenv("TEMPDIR")) || +static error_code TempDir(SmallVectorImpl<char> &result) { + // FIXME: Don't use TMPDIR if program is SUID or SGID enabled. + const char *dir = 0; + (dir = std::getenv("TMPDIR")) || (dir = std::getenv("TMP")) || + (dir = std::getenv("TEMP")) || (dir = std::getenv("TEMPDIR")) || #ifdef P_tmpdir - (dir = P_tmpdir) || + (dir = P_tmpdir) || #endif - (dir = "/tmp"); + (dir = "/tmp"); - result.clear(); - StringRef d(dir); - result.append(d.begin(), d.end()); - return error_code::success(); - } + result.clear(); + StringRef d(dir); + result.append(d.begin(), d.end()); + return error_code::success(); } static error_code createUniqueEntity(const Twine &Model, int &ResultFD, diff --git a/lib/Support/Windows/Path.inc b/lib/Support/Windows/Path.inc index f3c7ba1a24..2e33c129e3 100644 --- a/lib/Support/Windows/Path.inc +++ b/lib/Support/Windows/Path.inc @@ -44,31 +44,29 @@ using namespace llvm; using llvm::sys::windows::UTF8ToUTF16; using llvm::sys::windows::UTF16ToUTF8; -namespace { - error_code TempDir(SmallVectorImpl<wchar_t> &result) { - retry_temp_dir: - DWORD len = ::GetTempPathW(result.capacity(), result.begin()); +static error_code TempDir(SmallVectorImpl<wchar_t> &result) { +retry_temp_dir: + DWORD len = ::GetTempPathW(result.capacity(), result.begin()); - if (len == 0) - return windows_error(::GetLastError()); - - if (len > result.capacity()) { - result.reserve(len); - goto retry_temp_dir; - } + if (len == 0) + return windows_error(::GetLastError()); - result.set_size(len); - return error_code::success(); + if (len > result.capacity()) { + result.reserve(len); + goto retry_temp_dir; } - bool is_separator(const wchar_t value) { - switch (value) { - case L'\\': - case L'/': - return true; - default: - return false; - } + result.set_size(len); + return error_code::success(); +} + +static bool is_separator(const wchar_t value) { + switch (value) { + case L'\\': + case L'/': + return true; + default: + return false; } } |