Remove unnecessary branches in utilstrencodings string constructors.

bitcoin · 4b1c0f2e2e870a3285811bd7b68e14c2edd6a827 · JeremyRubin committed Mar 28, 2017 · Mar 28, 2017 · 4b1c0f2
1 parent e19db7b
commit 4b1c0f2e2e870a3285811bd7b68e14c2edd6a827
Unified Split

Showing with 2 additions and 2 deletions.

+2 −2 src/utilstrencodings.cpp
diff --git a/src/utilstrencodings.cpp b/src/utilstrencodings.cpp
@@ -228,7 +228,7 @@ std::vector<unsigned char> DecodeBase64(const char* p, bool* pfInvalid)
 std::string DecodeBase64(const std::string& str)
 {
     std::vector<unsigned char> vchRet = DecodeBase64(str.c_str());
-    return (vchRet.size() == 0) ? std::string() : std::string((const char*)vchRet.data(), vchRet.size());
+    return std::string((const char*)vchRet.data(), vchRet.size());
 }
 
 std::string EncodeBase32(const unsigned char* pch, size_t len)
@@ -415,7 +415,7 @@ std::vector<unsigned char> DecodeBase32(const char* p, bool* pfInvalid)
 std::string DecodeBase32(const std::string& str)
 {
     std::vector<unsigned char> vchRet = DecodeBase32(str.c_str());
-    return (vchRet.size() == 0) ? std::string() : std::string((const char*) vchRet.data(), vchRet.size());
+    return std::string((const char*)vchRet.data(), vchRet.size());
 }
 
 static bool ParsePrechecks(const std::string& str)