Use std::string::append instead of appending std::string() temporaries.

8 files changed, 12 insertions, 12 deletions

diff --git a/src/ExpatMetalinkProcessor.cc b/src/ExpatMetalinkProcessor.cc
index f98cf51f..de90bf03 100644
--- a/src/ExpatMetalinkProcessor.cc
+++ b/src/ExpatMetalinkProcessor.cc
@@ -140,7 +140,7 @@ void mlCharacters(void* userData, const char* ch, int len)
 {
   SessionData* sd = reinterpret_cast<SessionData*>(userData);
   if(sd->stm_->needsCharactersBuffering()) {
-    sd->charactersStack_.front() += std::string(&ch[0], &ch[len]);
+    sd->charactersStack_.front().append(&ch[0], &ch[len]);
   }
 }
 } // namespace
diff --git a/src/ExpatXmlRpcRequestProcessor.cc b/src/ExpatXmlRpcRequestProcessor.cc
index 3454b5e6..f2e2f804 100644
--- a/src/ExpatXmlRpcRequestProcessor.cc
+++ b/src/ExpatXmlRpcRequestProcessor.cc
@@ -99,7 +99,7 @@ void mlCharacters(void* userData, const char* ch, int len)
 {
   SessionData* sd = reinterpret_cast<SessionData*>(userData);
   if(sd->stm_->needsCharactersBuffering()) {
-    sd->charactersStack_.top() += std::string(&ch[0], &ch[len]);
+    sd->charactersStack_.top().append(&ch[0], &ch[len]);
   }
 }
 } // namespace
diff --git a/src/XML2SAXMetalinkProcessor.cc b/src/XML2SAXMetalinkProcessor.cc
index 152fd2dc..b40d0e6c 100644
--- a/src/XML2SAXMetalinkProcessor.cc
+++ b/src/XML2SAXMetalinkProcessor.cc
@@ -137,7 +137,7 @@ void mlCharacters(void* userData, const xmlChar* ch, int len)
 {
   SessionData* sd = reinterpret_cast<SessionData*>(userData);
   if(sd->stm_->needsCharactersBuffering()) {
-    sd->charactersStack_.front() += std::string(&ch[0], &ch[len]);
+    sd->charactersStack_.front().append(&ch[0], &ch[len]);
   }
 }
 } // namespace
diff --git a/src/Xml2XmlRpcRequestProcessor.cc b/src/Xml2XmlRpcRequestProcessor.cc
index 8bf71c50..8f22f7b1 100644
--- a/src/Xml2XmlRpcRequestProcessor.cc
+++ b/src/Xml2XmlRpcRequestProcessor.cc
@@ -101,7 +101,7 @@ void mlCharacters(void* userData, const xmlChar* ch, int len)
 {
   SessionData* sd = reinterpret_cast<SessionData*>(userData);
   if(sd->stm_->needsCharactersBuffering()) {
-    sd->charactersStack_.top() += std::string(&ch[0], &ch[len]);
+    sd->charactersStack_.top().append(&ch[0], &ch[len]);
   }
 }
 } // namespace
diff --git a/src/base32.cc b/src/base32.cc
index a6601975..112964fe 100644
--- a/src/base32.cc
+++ b/src/base32.cc
@@ -63,7 +63,7 @@ std::string encode(const std::string& src)
         temp[7-j] = B32TABLE[buf&0x1fu];
         buf >>= 5;
       }
-      ret += std::string(&temp[0], &temp[8]);
+      ret.append(&temp[0], &temp[8]);
       count = 0;
       buf = 0;      
     }
@@ -87,9 +87,9 @@ std::string encode(const std::string& src)
     temp[r-1-j] = B32TABLE[buf&0x1fu];
     buf >>= 5;
   }
-  ret += std::string(&temp[0], &temp[r]);
+  ret.append(&temp[0], &temp[r]);
   if(r) {
-    ret += std::string(8-r, '=');
+    ret.append(8-r, '=');
   }
   return ret;
 }
@@ -126,7 +126,7 @@ std::string decode(const std::string& src)
     bits = bits/8*8;
     buf = hton64(buf);
     char* p = reinterpret_cast<char*>(&buf);
-    ret += std::string(&p[(64-bits)/8], &p[8]);
+    ret.append(&p[(64-bits)/8], &p[8]);
   }
   return ret;
 }
diff --git a/src/bittorrent_helper.cc b/src/bittorrent_helper.cc
index 2506659a..25ecf9ae 100644
--- a/src/bittorrent_helper.cc
+++ b/src/bittorrent_helper.cc
@@ -663,7 +663,7 @@ std::string generatePeerId(const std::string& peerIdPrefix)
   int len = 20-peerIdPrefix.size();
   if(len > 0) {
     util::generateRandomData(buf, len);
-    peerId += std::string(&buf[0], &buf[len]);
+    peerId.append(&buf[0], &buf[len]);
   } if(peerId.size() > 20) {
     peerId.erase(20);
   }
diff --git a/src/json.cc b/src/json.cc
index e686b606..501c9cff 100644
--- a/src/json.cc
+++ b/src/json.cc
@@ -156,7 +156,7 @@ decodeString
       break;
     }
     if(*first == '\\') {
-      s += std::string(offset, first);
+      s.append(offset, first);
       ++first;
       checkEof(first, last);
       if(*first == 'u') {
@@ -235,7 +235,7 @@ decodeString
   }
   checkEof(first, last);
   if(std::distance(offset, first) > 0) {
-    s += std::string(offset, first);
+    s.append(offset, first);
   }
   if(!util::isUtf8(s)) {
     throw DL_ABORT_EX2("JSON decoding failed: Non UTF-8 string.",
diff --git a/src/uri.cc b/src/uri.cc
index 42e26b15..4b6ec80e 100644
--- a/src/uri.cc
+++ b/src/uri.cc
@@ -332,7 +332,7 @@ std::string joinUri(const std::string& baseUri, const std::string& uri)
        !util::endsWith(res, "/")) {
       res += "/";
     }
-    res += std::string(end, qend);
+    res.append(end, qend);
     return res;
   }
 }