From 50122f0ab35e16446e652bb62efeed7f4b1da8c1 Mon Sep 17 00:00:00 2001
From: Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
Date: Sun, 28 Nov 2010 19:06:56 +0900
Subject: [PATCH] Renamed Exception::errno_ as Exception::errNum_.

---
 src/AbstractDiskWriter.cc |  2 +-
 src/Exception.cc          | 55 ++++++++++++++++++++++++++++++---------
 src/Exception.h           |  9 +++----
 3 files changed, 47 insertions(+), 19 deletions(-)

diff --git a/src/AbstractDiskWriter.cc b/src/AbstractDiskWriter.cc
index e343857a..39b989f4 100644
--- a/src/AbstractDiskWriter.cc
+++ b/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;
diff --git a/src/Exception.cc b/src/Exception.cc
index 5b93242f..6b1565c9 100644
--- a/src/Exception.cc
+++ b/src/Exception.cc
@@ -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_;
diff --git a/src/Exception.h b/src/Exception.h
index 2be24127..a5724c2e 100644
--- a/src/Exception.h
+++ b/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_;
   }
 };