From 6f2ffdb73f9553b3021863bf60ee26bb8c099eb7 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. llvm-svn: 49041 --- llvm/utils/TableGen/TGLexer.cpp | 4 ++-- llvm/utils/TableGen/TableGen.cpp | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) (limited to 'llvm/utils') diff --git a/llvm/utils/TableGen/TGLexer.cpp b/llvm/utils/TableGen/TGLexer.cpp index 2af35b05d6d..a6de239e6f6 100644 --- a/llvm/utils/TableGen/TGLexer.cpp +++ b/llvm/utils/TableGen/TGLexer.cpp @@ -256,12 +256,12 @@ bool TGLexer::LexInclude() { std::string Filename = CurStrVal; // Try to find the file. - MemoryBuffer *NewBuf = MemoryBuffer::getFile(&Filename[0], Filename.size()); + MemoryBuffer *NewBuf = MemoryBuffer::getFile(Filename.c_str()); // If the file didn't exist directly, see if it's in an include path. for (unsigned i = 0, e = IncludeDirectories.size(); i != e && !NewBuf; ++i) { std::string IncFile = IncludeDirectories[i] + "/" + Filename; - NewBuf = MemoryBuffer::getFile(&IncFile[0], IncFile.size()); + NewBuf = MemoryBuffer::getFile(IncFile.c_str()); } if (NewBuf == 0) { diff --git a/llvm/utils/TableGen/TableGen.cpp b/llvm/utils/TableGen/TableGen.cpp index 7f8987d5e68..cc996c58466 100644 --- a/llvm/utils/TableGen/TableGen.cpp +++ b/llvm/utils/TableGen/TableGen.cpp @@ -107,8 +107,7 @@ RecordKeeper llvm::Records; static bool ParseFile(const std::string &Filename, const std::vector &IncludeDirs) { std::string ErrorStr; - MemoryBuffer *F = MemoryBuffer::getFileOrSTDIN(&Filename[0], Filename.size(), - &ErrorStr); + MemoryBuffer *F = MemoryBuffer::getFileOrSTDIN(Filename.c_str(), &ErrorStr); if (F == 0) { cerr << "Could not open input file '" + Filename + "': " << ErrorStr <<"\n"; return true; -- cgit v1.2.3