Renamed Exception::errno_ as Exception::errNum_.

src/AbstractDiskWriter.cc

@@ -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;

src/Exception.cc

@@ -38,20 +38,49 @@
 
 namespace aria2 {
 
-Exception::Exception(const char* file, int line, const std::string& msg):
+Exception::Exception
-  file_(file), line_(line), errno_(0),  msg_(msg) {}
+(const char* file,
-
+ int line,
-Exception::Exception(const char* file, int line, const std::string& msg,
+ const std::string& msg)
-                     const Exception& cause):
+  : file_(file),
-  file_(file), line_(line), errno_(0), msg_(msg), cause_(cause.copy()) {}
+    line_(line),
-
+    errNum_(0),
-Exception::Exception(const char* file, int line, const Exception& e):
+    msg_(msg)
-  file_(file), line_(line), errno_(0), msg_(e.msg_), cause_(e.cause_)
 {}
 
 Exception::Exception
-(const char* file, int line, int errnoArg, const std::string& msg):
+(const char* file,
-  file_(file), line_(line), errno_(errnoArg), msg_(msg) {}
+ 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_) {
+  if(errNum_) {
-    s << "errno=" << errno_ << " ";
+    s << "errno=" << errNum_ << " ";
   }
   s  << what() << "\n";
   SharedHandle<Exception> e = cause_;

src/Exception.h

@@ -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_;
   }
 };