summaryrefslogtreecommitdiffstats
path: root/llvm/utils
diff options
context:
space:
mode:
authorChris Lattner <sabre@nondot.org>2008-04-01 18:04:03 +0000
committerChris Lattner <sabre@nondot.org>2008-04-01 18:04:03 +0000
commit6f2ffdb73f9553b3021863bf60ee26bb8c099eb7 (patch)
treea80cea5404f45341b799001f8ecd061867fdf9e2 /llvm/utils
parent5db870c90409eebff58ce199ea625d880eb10b20 (diff)
downloadbcm5719-llvm-6f2ffdb73f9553b3021863bf60ee26bb8c099eb7.tar.gz
bcm5719-llvm-6f2ffdb73f9553b3021863bf60ee26bb8c099eb7.zip
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
Diffstat (limited to 'llvm/utils')
-rw-r--r--llvm/utils/TableGen/TGLexer.cpp4
-rw-r--r--llvm/utils/TableGen/TableGen.cpp3
2 files changed, 3 insertions, 4 deletions
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<std::string> &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;
OpenPOWER on IntegriCloud