Changeset 1215

Timestamp:

Oct 10, 2010, 1:41:30 AM (13 years ago)

Author:

Peter Johansson

Message:

extending SVNException to also hold/take svn_error_t. refs #371

Location:

trunk/lib

Files:

• SVN.cc (modified) (1 diff)
• SVN.h (modified) (1 diff)

trunk/lib/SVN.cc

@@ -38 +38 @@
 #include <subversion-1/svn_subst.h>
 
+#include <sstream>
+#include <string>
+
 namespace theplu {
 namespace svndigest {
+
+
+  SVNException::SVNException(const std::string& msg, svn_error_t* error)
+    : std::runtime_error(""), error_(error), msg_(msg) {}
+
+
+  SVNException::~SVNException(void) throw() {}
+
+
+  const char* SVNException::what(void) const throw()
+  {
+    std::stringstream ss;
+    if (error_) {
+      apr_size_t bufsize=255;
+      char buf[255];
+      ss << svn_err_best_message(error_, buf, bufsize);
+    }
+    if (msg_.size()) {
+      ss << msg_;
+    }
+    
+    return ss.str().c_str();
+  }
+
+
+  const svn_error_t* SVNException::error(void) const
+  {
+    return error_;
+  }
 
 

trunk/lib/SVN.h

@@ -50 +50 @@
   ///
   struct SVNException : public std::runtime_error
-  { inline SVNException(const std::string& msg) : runtime_error(msg) {} };
+  { 
+    SVNException(const std::string& msg, svn_error_t* error=NULL);
+
+    virtual ~SVNException(void) throw();
+    /**
+       override base implementation
+     */
+    const char* what(void) const throw();
+
+    /**
+       access svn_error_t
+     */
+    const svn_error_t* error(void) const;
+  private:
+    svn_error_t* error_;
+    std::string msg_;
+  };
 
   /**