Changeset 1221

Timestamp:

Oct 13, 2010, 4:45:55 PM (13 years ago)

Author:

Peter Johansson

Message:

fix error_test.sh failure on Linux associated with problems in SVNException. Avoid returning const char* to temporary string. Perform arithmetic on int not int*.

File:

• trunk/lib/SVN.cc (modified) (4 diffs)

trunk/lib/SVN.cc

@@ -38 +38 @@
 #include <subversion-1/svn_subst.h>
 
-#include <sstream>
 #include <string>
 
@@ -49 +48 @@
   {
     ref_count_ = new int(1);
+    if (error_) {
+      apr_size_t bufsize=255;
+      char buf[255];
+      msg_ = svn_err_best_message(error_, buf, bufsize);
+    }
+    if (msg.size()) {
+      msg_ += msg;
+    }
   }
 
@@ -61 +68 @@
   SVNException::~SVNException(void) throw() 
   {
-    --ref_count_;
-    if (!ref_count_) {
+    --(*ref_count_);
+    if (!(*ref_count_)) {
       delete ref_count_;
       ref_count_=NULL;
@@ -73 +80 @@
   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();
+    return msg_.c_str();
   }