github
/
aria2
mirror of https://github.com/aria2/aria2
1
0
Fork 0
Code Issues Releases Wiki Activity

Renamed Exception::errno_ as Exception::errNum_.

pull/1/head
Tatsuhiro Tsujikawa 2010-11-28 19:06:56 +09:00
parent ecbc05012c
commit 50122f0ab3
3 changed files with 47 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/AbstractDiskWriter.cc
View File

@ -71,7 +71,7 @@ void AbstractDiskWriter::openFile(uint64_t totalLength)
try {
openExistingFile(totalLength);
} catch(RecoverableException& e) {
if(e.getErrno() == ENOENT) {
if(e.getErrNum() == ENOENT) {
initAndOpenFile(totalLength);
} else {
throw;

55
src/Exception.cc
View File

@ -38,20 +38,49 @@
namespace aria2 {
Exception::Exception(const char* file, int line, const std::string& msg):
file_(file), line_(line), errno_(0), msg_(msg) {}
Exception::Exception(const char* file, int line, const std::string& msg,
const Exception& cause):
file_(file), line_(line), errno_(0), msg_(msg), cause_(cause.copy()) {}
Exception::Exception(const char* file, int line, const Exception& e):
file_(file), line_(line), errno_(0), msg_(e.msg_), cause_(e.cause_)
Exception::Exception
(const char* file,
int line,
const std::string& msg)
: file_(file),
line_(line),
errNum_(0),
msg_(msg)
{}
Exception::Exception
(const char* file, int line, int errnoArg, const std::string& msg):
file_(file), line_(line), errno_(errnoArg), msg_(msg) {}
(const char* file,
int line,
const std::string& msg,
const Exception& cause)
: file_(file),
line_(line),
errNum_(0),
msg_(msg),
cause_(cause.copy())
{}
Exception::Exception
(const char* file,
int line,
const Exception& e)
: file_(file),
line_(line),
errNum_(0),
msg_(e.msg_),
cause_(e.cause_)
{}
Exception::Exception
(const char* file,
int line,
int errNum,
const std::string& msg)
: file_(file),
line_(line),
errNum_(errNum),
msg_(msg)
{}
Exception::~Exception() throw() {}
@ -59,8 +88,8 @@ std::string Exception::stackTrace() const
{
std::stringstream s;
s << "Exception: " << "[" << file_ << ":" << line_ << "] ";
if(errno_) {
s << "errno=" << errno_ << " ";
if(errNum_) {
s << "errno=" << errNum_ << " ";
}
s << what() << "\n";
SharedHandle<Exception> e = cause_;

9
src/Exception.h
View File

@ -50,12 +50,11 @@ private:
int line_;
int errno_;
int errNum_;
std::string msg_;
SharedHandle<Exception> cause_;
protected:
virtual SharedHandle<Exception> copy() const = 0;
@ -67,7 +66,7 @@ public:
Exception(const char* file, int line, const Exception& e);
Exception(const char* file, int line, int errnoArg, const std::string& msg);
Exception(const char* file, int line, int errNum, const std::string& msg);
virtual ~Exception() throw();
@ -75,9 +74,9 @@ public:
std::string stackTrace() const;
int getErrno() const
int getErrNum() const
{
return errno_;
return errNum_;
}
};