6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2025-08-17 21:29:02 +00:00
Code Issues Projects Releases Wiki Activity

Remove unused has_magic.

Browse Source 
This will allow inlining get_magic, which should in turn fix one of the mingw
build problems after the switch to std::error_code.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@210712 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Rafael Espindola
2014-06-11 21:53:22 +00:00
parent a2d36a20fa
commit c6d63a3b0d
4 changed files with 2 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
include/llvm/Support/FileSystem.h
View File

@@ -603,14 +603,6 @@ error_code openFileForWrite(const Twine &Name, int &ResultFD, OpenFlags Flags,
error_code openFileForRead(const Twine &Name, int &ResultFD); 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. /// @brief Get \a path's first \a len bytes.
/// ///
/// @param path Input path. /// @param path Input path.

18
lib/Support/Path.cpp
View File

@@ -890,24 +890,6 @@ void directory_entry::replace_filename(const Twine &filename, file_status st) {
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. /// @brief Identify the magic in magic.
file_magic identify_magic(StringRef Magic) { file_magic identify_magic(StringRef Magic) {
if (Magic.size() < 4) if (Magic.size() < 4)

12
unittests/Support/FileOutputBufferTest.cpp
View File

@@ -46,11 +46,7 @@ TEST(FileOutputBuffer, Test) {
// Commit buffer. // Commit buffer.
ASSERT_NO_ERROR(Buffer->commit()); 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. // Verify file is correct size.
uint64_t File1Size; uint64_t File1Size;
ASSERT_NO_ERROR(fs::file_size(Twine(File1), 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 // Commit buffer, but size down to smaller size
ASSERT_NO_ERROR(Buffer->commit(5000)); 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. // Verify file is correct size.
uint64_t File3Size; uint64_t File3Size;
ASSERT_NO_ERROR(fs::file_size(Twine(File3), File3Size)); ASSERT_NO_ERROR(fs::file_size(Twine(File3), File3Size));

3
unittests/Support/Path.cpp
View File

@@ -539,9 +539,6 @@ TEST_F(FileSystemTest, Magic) {
StringRef magic(i->magic_str, i->magic_str_len); StringRef magic(i->magic_str, i->magic_str_len);
file << magic; file << magic;
file.close(); 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)); EXPECT_EQ(i->magic, fs::identify_magic(magic));
ASSERT_NO_ERROR(fs::remove(Twine(file_pathname))); ASSERT_NO_ERROR(fs::remove(Twine(file_pathname)));
} }