From 2183ade0c4e9cd7e923d325a97ff3ddfdc9fc941 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Sa=C5=82aban?= Date: Sat, 7 Oct 2017 02:04:33 +0200 Subject: [PATCH 1/2] Don't try to create wallet-dir when it's not given, don't crash if wallet-dir already exists. --- src/wallet/wallet_rpc_server.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/wallet/wallet_rpc_server.cpp b/src/wallet/wallet_rpc_server.cpp index 46b092376..195de0c89 100644 --- a/src/wallet/wallet_rpc_server.cpp +++ b/src/wallet/wallet_rpc_server.cpp @@ -154,7 +154,7 @@ namespace tools #else #define MKDIR(path, mode) mkdir(path, mode) #endif - if (MKDIR(m_wallet_dir.c_str(), 0700) < 0) + if (!m_wallet_dir.empty() && MKDIR(m_wallet_dir.c_str(), 0700) < 0 && errno != EEXIST) { #ifdef _WIN32 LOG_ERROR(tr("Failed to create directory ") + m_wallet_dir); From dc19659d166aa15ca09b6d24ab83844bbb8b71f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Sa=C5=82aban?= Date: Sat, 7 Oct 2017 19:29:30 +0200 Subject: [PATCH 2/2] Remove network_address_base which has been merged with ipv4_network_address in 8b006877 --- src/debug_utilities/object_sizes.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/src/debug_utilities/object_sizes.cpp b/src/debug_utilities/object_sizes.cpp index 47ba5cf6c..c56f97377 100644 --- a/src/debug_utilities/object_sizes.cpp +++ b/src/debug_utilities/object_sizes.cpp @@ -84,7 +84,6 @@ int main(int argc, char* argv[]) SL(cryptonote::txpool_tx_meta_t); - SL(epee::net_utils::network_address_base); SL(epee::net_utils::ipv4_network_address); SL(epee::net_utils::network_address); SL(epee::net_utils::connection_context_base);