[llvm-commits] CVS: llvm/lib/Bytecode/Reader/ReaderWrappers.cpp
Brian Gaeke
gaeke at cs.uiuc.edu
Thu Dec 11 18:48:06 PST 2003
Changes in directory llvm/lib/Bytecode/Reader:
ReaderWrappers.cpp updated: 1.18 -> 1.19
---
Log message:
Throw better error messages, by calling strerror(errno) when we
get an error inside the bytecode reader.
---
Diffs of the changes: (+9 -4)
Index: llvm/lib/Bytecode/Reader/ReaderWrappers.cpp
diff -u llvm/lib/Bytecode/Reader/ReaderWrappers.cpp:1.18 llvm/lib/Bytecode/Reader/ReaderWrappers.cpp:1.19
--- llvm/lib/Bytecode/Reader/ReaderWrappers.cpp:1.18 Wed Nov 19 10:06:55 2003
+++ llvm/lib/Bytecode/Reader/ReaderWrappers.cpp Thu Dec 11 18:47:44 2003
@@ -19,6 +19,7 @@
#include "Support/StringExtras.h"
#include "Config/fcntl.h"
#include <sys/stat.h>
+#include <cerrno>
#include "Config/unistd.h"
#include "Config/sys/mman.h"
using namespace llvm;
@@ -57,22 +58,26 @@
};
}
+static std::string ErrnoMessage (int savedErrNum, std::string descr) {
+ return ::strerror(savedErrNum) + std::string(", while trying to ") + descr;
+}
+
BytecodeFileReader::BytecodeFileReader(const std::string &Filename) {
FDHandle FD = open(Filename.c_str(), O_RDONLY);
if (FD == -1)
- throw std::string("Error opening file!");
+ throw ErrnoMessage(errno, "open '" + Filename + "'");
// Stat the file to get its length...
struct stat StatBuf;
if (fstat(FD, &StatBuf) == -1 || StatBuf.st_size == 0)
- throw std::string("Error stat'ing file!");
+ throw ErrnoMessage(errno, "stat '" + Filename + "'");
// mmap in the file all at once...
Length = StatBuf.st_size;
Buffer = (unsigned char*)mmap(0, Length, PROT_READ, MAP_PRIVATE, FD, 0);
if (Buffer == (unsigned char*)MAP_FAILED)
- throw std::string("Error mmapping file!");
+ throw ErrnoMessage(errno, "map '" + Filename + "' into memory");
try {
// Parse the bytecode we mmapped in
@@ -167,7 +172,7 @@
// Read in all of the data from stdin, we cannot mmap stdin...
while ((BlockSize = ::read(0 /*stdin*/, Buffer, 4096*4))) {
if (BlockSize == -1)
- throw std::string("Error reading from stdin!");
+ throw ErrnoMessage(errno, "read from standard input");
FileData.insert(FileData.end(), Buffer, Buffer+BlockSize);
}
More information about the llvm-commits
mailing list