From 9aa3365426ef5b8b82361945bc6a8dbcd3d2bc2a Mon Sep 17 00:00:00 2001 From: Rafael Espindola Date: Thu, 20 Jun 2013 15:06:35 +0000 Subject: [PATCH] Rename fs::GetUniqueID to fs::getUniqueID to match the style guide. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@184431 91177308-0d34-0410-b5e6-96231b3b80d8 --- include/llvm/Support/FileSystem.h | 8 ++++++-- lib/Support/Unix/PathV2.inc | 2 +- lib/Support/Windows/PathV2.inc | 2 +- unittests/Support/Path.cpp | 8 ++++---- 4 files changed, 12 insertions(+), 8 deletions(-) diff --git a/include/llvm/Support/FileSystem.h b/include/llvm/Support/FileSystem.h index 9497e4de1db..c1e11c0052b 100644 --- a/include/llvm/Support/FileSystem.h +++ b/include/llvm/Support/FileSystem.h @@ -162,7 +162,7 @@ class file_status #endif friend bool equivalent(file_status A, file_status B); friend error_code status(const Twine &path, file_status &result); - friend error_code GetUniqueID(const Twine Path, uint64_t &Result); + friend error_code getUniqueID(const Twine Path, uint64_t &Result); file_type Type; perms Perms; public: @@ -563,7 +563,11 @@ file_magic identify_magic(StringRef magic); /// platform specific error_code. error_code identify_magic(const Twine &path, file_magic &result); -error_code GetUniqueID(const Twine Path, uint64_t &Result); +error_code getUniqueID(const Twine Path, uint64_t &Result); + +inline error_code GetUniqueID(const Twine Path, uint64_t &Result) { + return getUniqueID(Path, Result); +} /// This class represents a memory mapped file. It is based on /// boost::iostreams::mapped_file. diff --git a/lib/Support/Unix/PathV2.inc b/lib/Support/Unix/PathV2.inc index a806083b193..9602daad08f 100644 --- a/lib/Support/Unix/PathV2.inc +++ b/lib/Support/Unix/PathV2.inc @@ -356,7 +356,7 @@ error_code file_size(const Twine &path, uint64_t &result) { return error_code::success(); } -error_code GetUniqueID(const Twine Path, uint64_t &Result) { +error_code getUniqueID(const Twine Path, uint64_t &Result) { SmallString<128> Storage; StringRef P = Path.toNullTerminatedStringRef(Storage); diff --git a/lib/Support/Windows/PathV2.inc b/lib/Support/Windows/PathV2.inc index e6888f93e68..8815b0ec2f7 100644 --- a/lib/Support/Windows/PathV2.inc +++ b/lib/Support/Windows/PathV2.inc @@ -425,7 +425,7 @@ error_code file_size(const Twine &path, uint64_t &result) { return error_code::success(); } -error_code GetUniqueID(const Twine Path, uint64_t &Result) { +error_code getUniqueID(const Twine Path, uint64_t &Result) { file_status Status; if (error_code E = status(Path, Status)) return E; diff --git a/unittests/Support/Path.cpp b/unittests/Support/Path.cpp index 4f9d146c460..d5591ea1bdc 100644 --- a/unittests/Support/Path.cpp +++ b/unittests/Support/Path.cpp @@ -173,8 +173,8 @@ TEST_F(FileSystemTest, Unique) { // The same file should return an identical unique id. uint64_t F1, F2; - ASSERT_NO_ERROR(fs::GetUniqueID(Twine(TempPath), F1)); - ASSERT_NO_ERROR(fs::GetUniqueID(Twine(TempPath), F2)); + ASSERT_NO_ERROR(fs::getUniqueID(Twine(TempPath), F1)); + ASSERT_NO_ERROR(fs::getUniqueID(Twine(TempPath), F2)); ASSERT_EQ(F1, F2); // Different files should return different unique ids. @@ -184,7 +184,7 @@ TEST_F(FileSystemTest, Unique) { fs::unique_file("%%-%%-%%-%%.temp", FileDescriptor2, TempPath2)); uint64_t D; - ASSERT_NO_ERROR(fs::GetUniqueID(Twine(TempPath2), D)); + ASSERT_NO_ERROR(fs::getUniqueID(Twine(TempPath2), D)); ASSERT_NE(D, F1); ::close(FileDescriptor2); @@ -194,7 +194,7 @@ TEST_F(FileSystemTest, Unique) { // same unique id. We can test this by making a hard link. ASSERT_NO_ERROR(fs::create_hard_link(Twine(TempPath), Twine(TempPath2))); uint64_t D2; - ASSERT_NO_ERROR(fs::GetUniqueID(Twine(TempPath2), D2)); + ASSERT_NO_ERROR(fs::getUniqueID(Twine(TempPath2), D2)); ASSERT_EQ(D2, F1); ::close(FileDescriptor);