diff options
| author | Riccardo Spagni <ric@spagni.net> | 2018-12-04 17:33:18 +0200 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2018-12-04 17:33:19 +0200 |
| commit | 81418cb281c44481fc4137257df8e39623d94885 (patch) | |
| tree | 1e1ac74513bb5128de98949eb4a15bfb61997c53 /src/common | |
| parent | Merge pull request #4892 (diff) | |
| parent | wallet_rpc_server: do not use RPC data if the call failed (diff) | |
| download | monero-81418cb281c44481fc4137257df8e39623d94885.tar.xz | |
Merge pull request #4894
aee7a4e3 wallet_rpc_server: do not use RPC data if the call failed (moneromooo-monero)
1a0733e5 windows_service: fix memory leak (moneromooo-monero)
0dac3c64 unit_tests: do not rethrow a copy of an exception (moneromooo-monero)
5d9915ab cryptonote: fix get_unit for non default settings (moneromooo-monero)
d4f50cb1 remove some unused code (moneromooo-monero)
61163971 a few minor (but easy) performance tweaks (moneromooo-monero)
30023074 tests: slow_memmem now returns size_t (moneromooo-monero)
Diffstat (limited to 'src/common')
| -rw-r--r-- | src/common/base58.cpp | 2 | ||||
| -rw-r--r-- | src/common/base58.h | 2 | ||||
| -rw-r--r-- | src/common/dns_utils.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/common/base58.cpp b/src/common/base58.cpp index cd2272356..3562af486 100644 --- a/src/common/base58.cpp +++ b/src/common/base58.cpp @@ -234,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); diff --git a/src/common/base58.h b/src/common/base58.h index 02ca96956..69611859d 100644 --- a/src/common/base58.h +++ b/src/common/base58.h @@ -41,6 +41,6 @@ namespace tools bool decode(const std::string& enc, std::string& data); std::string encode_addr(uint64_t tag, const std::string& data); - 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); } } diff --git a/src/common/dns_utils.cpp b/src/common/dns_utils.cpp index 492648afa..417b5b4ac 100644 --- a/src/common/dns_utils.cpp +++ b/src/common/dns_utils.cpp @@ -303,7 +303,7 @@ std::vector<std::string> DNSResolver::get_record(const std::string& url, int rec // call DNS resolver, blocking. if return value not zero, something went wrong if (!ub_resolve(m_data->m_ub_context, string_copy(url.c_str()), record_type, DNS_CLASS_IN, &result)) { - dnssec_available = (result->secure || (!result->secure && result->bogus)); + dnssec_available = (result->secure || result->bogus); dnssec_valid = result->secure && !result->bogus; if (result->havedata) { |