From: Chris Lattner <sabre@nondot.org>
Date: Tue, 1 Apr 2008 18:04:30 +0000 (+0000)
Subject: Update to match simplified llvm MemoryBuffer interfaces for files.
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=35de512b9cb22a234a771b417507f71a2bbb5a94;p=clang

Update to match simplified llvm MemoryBuffer interfaces for files.


git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@49042 91177308-0d34-0410-b5e6-96231b3b80d8
---

diff --git a/Driver/SerializationTest.cpp b/Driver/SerializationTest.cpp
index 37f2b691cc..e9d6f59aef 100644
--- a/Driver/SerializationTest.cpp
+++ b/Driver/SerializationTest.cpp
@@ -163,8 +163,7 @@ SerializationTest::~SerializationTest() {
   using llvm::MemoryBuffer;
   
   llvm::OwningPtr<MemoryBuffer>
-    MBufferSer(MemoryBuffer::getFile(FNameDeclBefore.c_str(),
-                                     strlen(FNameDeclBefore.c_str())));
+    MBufferSer(MemoryBuffer::getFile(FNameDeclBefore.c_str()));
   
   if(!MBufferSer) {
     llvm::cerr << "ERROR: Cannot read pretty-printed file (pre-pickle).\n";
@@ -172,8 +171,7 @@ SerializationTest::~SerializationTest() {
   }
   
   llvm::OwningPtr<MemoryBuffer>
-    MBufferDSer(MemoryBuffer::getFile(FNameDeclAfter.c_str(),
-                                      strlen(FNameDeclAfter.c_str())));
+    MBufferDSer(MemoryBuffer::getFile(FNameDeclAfter.c_str()));
   
   if(!MBufferDSer) {
     llvm::cerr << "ERROR: Cannot read pretty-printed file (post-pickle).\n";
diff --git a/lib/AST/TranslationUnit.cpp b/lib/AST/TranslationUnit.cpp
index b91448b2d3..fdc37a8443 100644
--- a/lib/AST/TranslationUnit.cpp
+++ b/lib/AST/TranslationUnit.cpp
@@ -126,8 +126,7 @@ clang::ReadASTBitcodeFile(const llvm::sys::Path& Filename, FileManager& FMgr) {
   
   // Create the memory buffer that contains the contents of the file.  
   llvm::OwningPtr<llvm::MemoryBuffer> 
-    MBuffer(llvm::MemoryBuffer::getFile(Filename.c_str(),
-                                        strlen(Filename.c_str())));
+    MBuffer(llvm::MemoryBuffer::getFile(Filename.c_str()));
   
   if (!MBuffer) {
     // FIXME: Provide diagnostic.
diff --git a/lib/Basic/SourceManager.cpp b/lib/Basic/SourceManager.cpp
index 9f6624c0b7..d7d2c84a4c 100644
--- a/lib/Basic/SourceManager.cpp
+++ b/lib/Basic/SourceManager.cpp
@@ -43,8 +43,7 @@ const ContentCache* SourceManager::getContentCache(const FileEntry *FileEnt) {
   
   // Nope, get information.
   const MemoryBuffer *File =
-    MemoryBuffer::getFile(FileEnt->getName(), strlen(FileEnt->getName()), 0,
-                          FileEnt->getSize());
+    MemoryBuffer::getFile(FileEnt->getName(), 0, FileEnt->getSize());
   if (File == 0)
     return 0;
 
diff --git a/lib/Lex/HeaderMap.cpp b/lib/Lex/HeaderMap.cpp
index 282e742b4c..d058e1ece4 100644
--- a/lib/Lex/HeaderMap.cpp
+++ b/lib/Lex/HeaderMap.cpp
@@ -79,8 +79,7 @@ const HeaderMap *HeaderMap::Create(const FileEntry *FE) {
   if (FileSize <= sizeof(HMapHeader)) return 0;
   
   llvm::OwningPtr<const llvm::MemoryBuffer> FileBuffer( 
-    llvm::MemoryBuffer::getFile(FE->getName(), strlen(FE->getName()), 0,
-                                FE->getSize()));
+    llvm::MemoryBuffer::getFile(FE->getName(), 0, FE->getSize()));
   if (FileBuffer == 0) return 0;  // Unreadable file?
   const char *FileStart = FileBuffer->getBufferStart();