diff options
| -rw-r--r-- | include/llvm/Support/FileSystem.h | 8 | ||||
| -rw-r--r-- | lib/Support/Path.cpp | 18 | ||||
| -rw-r--r-- | unittests/Support/FileOutputBufferTest.cpp | 12 | ||||
| -rw-r--r-- | unittests/Support/Path.cpp | 3 |
4 files changed, 2 insertions, 39 deletions
diff --git a/include/llvm/Support/FileSystem.h b/include/llvm/Support/FileSystem.h index 271cec3a09..dbf8f9928b 100644 --- a/include/llvm/Support/FileSystem.h +++ b/include/llvm/Support/FileSystem.h @@ -603,14 +603,6 @@ error_code openFileForWrite(const Twine &Name, int &ResultFD, OpenFlags Flags, error_code openFileForRead(const Twine &Name, int &ResultFD); -/// @brief Are \a path's first bytes \a magic? -/// -/// @param path Input path. -/// @param magic Byte sequence to compare \a path's first len(magic) bytes to. -/// @returns errc::success if result has been successfully set, otherwise a -/// platform specific error_code. -error_code has_magic(const Twine &path, const Twine &magic, bool &result); - /// @brief Get \a path's first \a len bytes. /// /// @param path Input path. diff --git a/lib/Support/Path.cpp b/lib/Support/Path.cpp index a9ac88e5d3..c063bed2b5 100644 --- a/lib/Support/Path.cpp +++ b/lib/Support/Path.cpp @@ -890,24 +890,6 @@ void directory_entry::replace_filename(const Twine &filename, file_status st) { Status = st; } -error_code has_magic(const Twine &path, const Twine &magic, bool &result) { - SmallString<32> MagicStorage; - StringRef Magic = magic.toStringRef(MagicStorage); - SmallString<32> Buffer; - - if (error_code ec = get_magic(path, Magic.size(), Buffer)) { - if (ec == std::errc::value_too_large) { - // Magic.size() > file_size(Path). - result = false; - return error_code(); - } - return ec; - } - - result = Magic == Buffer; - return error_code(); -} - /// @brief Identify the magic in magic. file_magic identify_magic(StringRef Magic) { if (Magic.size() < 4) diff --git a/unittests/Support/FileOutputBufferTest.cpp b/unittests/Support/FileOutputBufferTest.cpp index 0801f85399..2ce9e71f85 100644 --- a/unittests/Support/FileOutputBufferTest.cpp +++ b/unittests/Support/FileOutputBufferTest.cpp @@ -46,11 +46,7 @@ TEST(FileOutputBuffer, Test) { // Commit buffer. ASSERT_NO_ERROR(Buffer->commit()); } - // Verify file exists and starts with special header. - bool MagicMatches = false; - ASSERT_NO_ERROR(fs::has_magic(Twine(File1), Twine("AABBCCDDEEFFGGHHIIJJ"), - MagicMatches)); - EXPECT_TRUE(MagicMatches); + // Verify file is correct size. uint64_t File1Size; ASSERT_NO_ERROR(fs::file_size(Twine(File1), File1Size)); @@ -86,11 +82,7 @@ TEST(FileOutputBuffer, Test) { // Commit buffer, but size down to smaller size ASSERT_NO_ERROR(Buffer->commit(5000)); } - // Verify file exists and starts with special header. - bool MagicMatches3 = false; - ASSERT_NO_ERROR(fs::has_magic(Twine(File3), Twine("AABBCCDDEEFFGGHHIIJJ"), - MagicMatches3)); - EXPECT_TRUE(MagicMatches3); + // Verify file is correct size. uint64_t File3Size; ASSERT_NO_ERROR(fs::file_size(Twine(File3), File3Size)); diff --git a/unittests/Support/Path.cpp b/unittests/Support/Path.cpp index d116acae2a..f5fb81539b 100644 --- a/unittests/Support/Path.cpp +++ b/unittests/Support/Path.cpp @@ -539,9 +539,6 @@ TEST_F(FileSystemTest, Magic) { StringRef magic(i->magic_str, i->magic_str_len); file << magic; file.close(); - bool res = false; - ASSERT_NO_ERROR(fs::has_magic(file_pathname.c_str(), magic, res)); - EXPECT_TRUE(res); EXPECT_EQ(i->magic, fs::identify_magic(magic)); ASSERT_NO_ERROR(fs::remove(Twine(file_pathname))); } |