4rkal/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2025-01-28 18:56:31 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Quick refactoring for cmd line usage (if bad arguments)

Browse Source
This commit is contained in:
Neozaru 2014-07-04 22:11:53 +02:00
parent c0ee58afa9
commit 009ba440a2
1 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/rpcwallet/wallet_rpc_server.cpp
View File

@ -412,6 +412,17 @@ namespace
const command_line::arg_descriptor<uint32_t> arg_log_level = {"set_log", "", 0, true}; const command_line::arg_descriptor<uint32_t> arg_log_level = {"set_log", "", 0, true};
} // file-local namespace } // file-local namespace
void print_version()
{
cout << CRYPTONOTE_NAME << " wallet v" << PROJECT_VERSION_LONG << endl;
}
void print_usage()
{
cout << "Usage: rpcwallet --wallet-file=<file> --rpc-bind-port=<port> [--daemon-address=<host>:<port>] [--rpc-bind-address=127.0.0.1]" << endl;
}
int main(int argc, char* argv[]) int main(int argc, char* argv[])
{ {
#ifdef WIN32 #ifdef WIN32
@ -445,13 +456,12 @@ int main(int argc, char* argv[])
if (command_line::get_arg(vm, command_line::arg_help)) if (command_line::get_arg(vm, command_line::arg_help))
{ {
cout << CRYPTONOTE_NAME << " wallet v" << PROJECT_VERSION_LONG; print_usage();
cout << "Usage: rpcwallet --wallet-file=<file> --rpc-bind-port=<port> [--daemon-address=<host>:<port>] [--rpc-bind-address=127.0.0.1]";
return false; return false;
} }
else if (command_line::get_arg(vm, command_line::arg_version)) else if (command_line::get_arg(vm, command_line::arg_version))
{ {
cout << CRYPTONOTE_NAME << " wallet v" << PROJECT_VERSION_LONG; print_version();
return false; return false;
} }
@ -470,7 +480,7 @@ int main(int argc, char* argv[])
log_space::log_singletone::get_default_log_file().c_str(), log_space::log_singletone::get_default_log_file().c_str(),
log_space::log_singletone::get_default_log_folder().c_str(), LOG_LEVEL_4); log_space::log_singletone::get_default_log_folder().c_str(), LOG_LEVEL_4);
cout << CRYPTONOTE_NAME << " wallet v" << PROJECT_VERSION_LONG; print_version();
if(command_line::has_arg(vm, arg_log_level)) if(command_line::has_arg(vm, arg_log_level))
{ {
@ -484,16 +494,19 @@ int main(int argc, char* argv[])
if(!command_line::has_arg(vm, arg_wallet_file) ) if(!command_line::has_arg(vm, arg_wallet_file) )
{ {
LOG_ERROR("Wallet file not set."); LOG_ERROR("Wallet file not set.");
print_usage();
return 1; return 1;
} }
if(!command_line::has_arg(vm, arg_daemon_address) ) if(!command_line::has_arg(vm, arg_daemon_address) )
{ {
LOG_ERROR("Daemon address not set."); LOG_ERROR("Daemon address not set.");
print_usage();
return 1; return 1;
} }
if(!command_line::has_arg(vm, arg_password) ) if(!command_line::has_arg(vm, arg_password) )
{ {
LOG_ERROR("Wallet password not set."); LOG_ERROR("Wallet password not set.");
print_usage();
return 1; return 1;
} }