maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Use new getFileSize function instead of sys/stat.h directly. 

llvm-svn: 10650
This commit is contained in:
Chris Lattner 2003-12-30 07:40:35 +00:00
parent 4a1c74dcf8
commit 9b75157c04
2 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
llvm/lib/Bytecode/Reader/ArchiveReader.cpp
View File

@ -18,7 +18,7 @@
#include "llvm/Bytecode/Reader.h"
#include "llvm/Module.h"
#include "Config/sys/stat.h"
#include "Support/FileUtilities.h"
#include "Config/sys/mman.h"
#include "Config/fcntl.h"
#include <cstdlib>
@ -164,17 +164,15 @@ static bool ReadArchiveBuffer(const std::string &ArchiveName,
//
bool ReadArchiveFile(const std::string &Filename, std::vector<Module*> &Objects,
std::string *ErrorStr) {
int Length = getFileSize(Filename);
if (Length == -1)
return Error(ErrorStr, "Error getting file length!");
int FD = open(Filename.c_str(), O_RDONLY);
if (FD == -1)
return Error(ErrorStr, "Error opening file!");
// Stat the file to get its length...
struct stat StatBuf;
if (fstat(FD, &StatBuf) == -1 || StatBuf.st_size == 0)
return Error(ErrorStr, "Error stat'ing file!");
// mmap in the file all at once...
int Length = StatBuf.st_size;
unsigned char *Buffer = (unsigned char*)mmap(0, Length, PROT_READ,
MAP_PRIVATE, FD, 0);
if (Buffer == (unsigned char*)MAP_FAILED)

11
llvm/lib/Bytecode/Reader/ReaderWrappers.cpp
View File

@ -21,7 +21,6 @@
#include "Config/fcntl.h"
#include "Config/unistd.h"
#include "Config/sys/mman.h"
#include <sys/stat.h>
#include <cerrno>
using namespace llvm;
@ -51,17 +50,15 @@ static std::string ErrnoMessage (int savedErrNum, std::string descr) {
}
BytecodeFileReader::BytecodeFileReader(const std::string &Filename) {
Length = getFileSize(Filename);
if (Length == -1)
throw ErrnoMessage(errno, "stat '" + Filename + "'");
FDHandle FD(open(Filename.c_str(), O_RDONLY));
if (FD == -1)
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 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)