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/simplewallet | |
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/simplewallet')
-rw-r--r-- | src/simplewallet/simplewallet.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/simplewallet/simplewallet.cpp b/src/simplewallet/simplewallet.cpp index 6e657b057..bcf6acbd5 100644 --- a/src/simplewallet/simplewallet.cpp +++ b/src/simplewallet/simplewallet.cpp @@ -6733,7 +6733,6 @@ static std::string get_human_readable_timestamp(uint64_t ts) struct tm tm; epee::misc_utils::get_gmt_time(tt, tm); uint64_t now = time(NULL); - uint64_t diff = ts > now ? ts - now : now - ts; strftime(buffer, sizeof(buffer), "%Y-%m-%d %H:%M:%S", &tm); return std::string(buffer); } |