[lld] r183762 - Convert another use of sys::identifyFileType.

Rafael Espindola rafael.espindola at gmail.com
Tue Jun 11 11:12:28 PDT 2013


Author: rafael
Date: Tue Jun 11 13:12:28 2013
New Revision: 183762

URL: http://llvm.org/viewvc/llvm-project?rev=183762&view=rev
Log:
Convert another use of sys::identifyFileType.

No functionality change.

Modified:
    lld/trunk/lib/ReaderWriter/ELF/Reader.cpp

Modified: lld/trunk/lib/ReaderWriter/ELF/Reader.cpp
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/lib/ReaderWriter/ELF/Reader.cpp?rev=183762&r1=183761&r2=183762&view=diff
==============================================================================
--- lld/trunk/lib/ReaderWriter/ELF/Reader.cpp (original)
+++ lld/trunk/lib/ReaderWriter/ELF/Reader.cpp Tue Jun 11 13:12:28 2013
@@ -85,15 +85,15 @@ public:
   error_code parseFile(std::unique_ptr<MemoryBuffer> &mb,
                        std::vector<std::unique_ptr<File> > &result) const {
     using llvm::object::ELFType;
-    llvm::sys::LLVMFileType fileType =
-        llvm::sys::identifyFileType(mb->getBuffer());
+    llvm::sys::fs::file_magic FileType =
+        llvm::sys::fs::identify_magic(mb->getBuffer());
 
     std::size_t MaxAlignment =
         1ULL << llvm::countTrailingZeros(uintptr_t(mb->getBufferStart()));
 
     llvm::error_code ec;
-    switch (fileType) {
-    case llvm::sys::ELF_Relocatable_FileType: {
+    switch (FileType) {
+    case llvm::sys::fs::file_magic::elf_relocatable: {
       std::unique_ptr<File> f(createELF<ELFFileCreateELFTraits>(
           getElfArchType(&*mb), MaxAlignment, _elfTargetInfo, std::move(mb),
           ec));
@@ -102,7 +102,7 @@ public:
       result.push_back(std::move(f));
       break;
     }
-    case llvm::sys::ELF_SharedObject_FileType: {
+    case llvm::sys::fs::file_magic::elf_shared_object: {
       auto f = createELF<DynamicFileCreateELFTraits>(
           getElfArchType(&*mb), MaxAlignment, _elfTargetInfo, std::move(mb));
       if (!f)
@@ -110,7 +110,7 @@ public:
       result.push_back(std::move(*f));
       break;
     }
-    case llvm::sys::Archive_FileType:
+    case llvm::sys::fs::file_magic::archive:
       ec = _readerArchive.parseFile(mb, result);
       break;
     default:





More information about the llvm-commits mailing list