From bc110af0eeef527f3343cee28052c853148e09cb Mon Sep 17 00:00:00 2001 From: moneromooo-monero Date: Tue, 27 Oct 2015 16:15:41 +0000 Subject: [PATCH] blockchain_utilities: properly exit on error Replace boolean values and exceptions where appropriate --- src/blockchain_utilities/blockchain_dump.cpp | 12 ++++++------ src/blockchain_utilities/blockchain_export.cpp | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/blockchain_utilities/blockchain_dump.cpp b/src/blockchain_utilities/blockchain_dump.cpp index ce028f66..da5a2ec3 100644 --- a/src/blockchain_utilities/blockchain_dump.cpp +++ b/src/blockchain_utilities/blockchain_dump.cpp @@ -185,7 +185,7 @@ int main(int argc, char* argv[]) if (!boost::filesystem::is_directory(dir_path)) { LOG_PRINT_RED_L0("dump directory path is a file: " << dir_path); - return false; + return 1; } } else @@ -193,7 +193,7 @@ int main(int argc, char* argv[]) if (!boost::filesystem::create_directory(dir_path)) { LOG_PRINT_RED_L0("Failed to create directory " << dir_path); - return false; + return 1; } } } @@ -201,7 +201,7 @@ int main(int argc, char* argv[]) std::ofstream raw_data_file; raw_data_file.open(output_file_path.string(), std::ios_base::out | std::ios::trunc); if (raw_data_file.fail()) - return false; + return 1; // If we wanted to use the memory pool, we would set up a fake_core. @@ -245,7 +245,7 @@ int main(int argc, char* argv[]) else { LOG_PRINT_L0("Invalid db type: " << db_type); - throw; + return 1; } boost::filesystem::path folder(m_config_folder); folder /= db->get_db_name(); @@ -259,7 +259,7 @@ int main(int argc, char* argv[]) catch (const std::exception& e) { LOG_PRINT_L0("Error opening database: " << e.what()); - throw; + return 1; } r = core_storage->init(db, opt_testnet); #endif @@ -425,7 +425,7 @@ int main(int argc, char* argv[]) CHECK_AND_ASSERT_MES(r, false, "Failed to dump blockchain"); if (raw_data_file.fail()) - return false; + return 1; raw_data_file.flush(); LOG_PRINT_L0("Blockchain dump OK"); diff --git a/src/blockchain_utilities/blockchain_export.cpp b/src/blockchain_utilities/blockchain_export.cpp index 4a96bad6..1bdaa3d7 100644 --- a/src/blockchain_utilities/blockchain_export.cpp +++ b/src/blockchain_utilities/blockchain_export.cpp @@ -151,7 +151,7 @@ int main(int argc, char* argv[]) catch (const std::exception& e) { LOG_PRINT_L0("Error opening database: " << e.what()); - throw; + return 1; } r = core_storage->init(db, opt_testnet); #endif