1 files changed, 3 insertions, 16 deletions
diff --git a/src/common/base58.cpp b/src/common/base58.cpp
index 75556cad9..3562af486 100644
--- a/src/common/base58.cpp
+++ b/src/common/base58.cpp
@@ -36,7 +36,6 @@
 
 #include "crypto/hash.h"
 #include "int-util.h"
-#include "util.h"
 #include "varint.h"
 
 namespace tools
@@ -109,20 +108,8 @@ namespace tools
         assert(1 <= size && size <= sizeof(uint64_t));
 
         uint64_t res = 0;
-        switch (9 - size)
-        {
-        case 1:            res |= *data++; /* FALLTHRU */
-        case 2: res <<= 8; res |= *data++; /* FALLTHRU */
-        case 3: res <<= 8; res |= *data++; /* FALLTHRU */
-        case 4: res <<= 8; res |= *data++; /* FALLTHRU */
-        case 5: res <<= 8; res |= *data++; /* FALLTHRU */
-        case 6: res <<= 8; res |= *data++; /* FALLTHRU */
-        case 7: res <<= 8; res |= *data++; /* FALLTHRU */
-        case 8: res <<= 8; res |= *data; break;
-        default: assert(false);
-        }
-
-        return res;
+        memcpy(reinterpret_cast<uint8_t*>(&res) + sizeof(uint64_t) - size, data, size);
+        return SWAP64BE(res);
       }
 
       void uint_64_to_8be(uint64_t num, size_t size, uint8_t* data)
@@ -247,7 +234,7 @@ namespace tools
       return encode(buf);
     }
 
-    bool decode_addr(std::string addr, uint64_t& tag, std::string& data)
+    bool decode_addr(const std::string &addr, uint64_t& tag, std::string& data)
     {
       std::string addr_data;
       bool r = decode(addr, addr_data);