From fc0036120cbfae4edfa372c36fb05f2756f5f0ee Mon Sep 17 00:00:00 2001 From: Chris Lattner Date: Tue, 1 Apr 2008 18:04:03 +0000 Subject: Change the MemoryBuffer::getFile* methods to take just a pointer to the start of a filename, not a filename+length. All clients can produce a null terminated name, and the system api's require null terminated strings anyway. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@49041 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Archive/Archive.cpp | 5 ++--- lib/Archive/ArchiveWriter.cpp | 6 ++---- 2 files changed, 4 insertions(+), 7 deletions(-) (limited to 'lib/Archive') diff --git a/lib/Archive/Archive.cpp b/lib/Archive/Archive.cpp index e32c716..a0e5eed 100644 --- a/lib/Archive/Archive.cpp +++ b/lib/Archive/Archive.cpp @@ -145,7 +145,7 @@ Archive::Archive(const sys::Path& filename) bool Archive::mapToMemory(std::string* ErrMsg) { - mapfile = MemoryBuffer::getFile(archPath.c_str(), archPath.size(), ErrMsg); + mapfile = MemoryBuffer::getFile(archPath.c_str(), ErrMsg); if (mapfile == 0) return true; base = mapfile->getBufferStart(); @@ -211,8 +211,7 @@ bool llvm::GetBitcodeSymbols(const sys::Path& fName, std::vector& symbols, std::string* ErrMsg) { std::auto_ptr Buffer( - MemoryBuffer::getFileOrSTDIN(&fName.toString()[0], - fName.toString().size())); + MemoryBuffer::getFileOrSTDIN(fName.c_str())); if (!Buffer.get()) { if (ErrMsg) *ErrMsg = "Could not open file '" + fName.toString() + "'"; return true; diff --git a/lib/Archive/ArchiveWriter.cpp b/lib/Archive/ArchiveWriter.cpp index afe9819..d3861f3 100644 --- a/lib/Archive/ArchiveWriter.cpp +++ b/lib/Archive/ArchiveWriter.cpp @@ -212,8 +212,7 @@ Archive::writeMember( const char *data = (const char*)member.getData(); MemoryBuffer *mFile = 0; if (!data) { - mFile = MemoryBuffer::getFile(member.getPath().c_str(), - member.getPath().size(), ErrMsg); + mFile = MemoryBuffer::getFile(member.getPath().c_str(), ErrMsg); if (mFile == 0) return true; data = mFile->getBufferStart(); @@ -407,8 +406,7 @@ Archive::writeToDisk(bool CreateSymbolTable, bool TruncateNames, bool Compress, // Map in the archive we just wrote. { - OwningPtr arch(MemoryBuffer::getFile(TmpArchive.c_str(), - TmpArchive.size())); + OwningPtr arch(MemoryBuffer::getFile(TmpArchive.c_str())); if (arch == 0) return true; const char* base = arch->getBufferStart(); -- cgit v1.1