monero-project/monero
monero-project/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2024-12-25 21:19:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

daemon: silence spurious warning about uninitialized variable

Browse source 
Also fixes a leak
This commit is contained in:
moneromooo-monero 2017-02-12 14:37:18 +00:00
parent 6e78915061
commit b560ed4ac6
No known key found for this signature in database
GPG key ID: 686F07454D6CEFC3
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/daemon/daemon.cpp
View file

@ -124,18 +124,18 @@ bool t_daemon::run(bool interactive)
return false; return false;
mp_internals->rpc.run(); mp_internals->rpc.run();
daemonize::t_command_server* rpc_commands; std::unique_ptr<daemonize::t_command_server> rpc_commands;
if (interactive) if (interactive)
{ {
// The first three variables are not used when the fourth is false // The first three variables are not used when the fourth is false
rpc_commands = new daemonize::t_command_server(0, 0, boost::none, false, mp_internals->rpc.get_server()); rpc_commands.reset(new daemonize::t_command_server(0, 0, boost::none, false, mp_internals->rpc.get_server()));
rpc_commands->start_handling(std::bind(&daemonize::t_daemon::stop_p2p, this)); rpc_commands->start_handling(std::bind(&daemonize::t_daemon::stop_p2p, this));
} }
mp_internals->p2p.run(); // blocks until p2p goes down mp_internals->p2p.run(); // blocks until p2p goes down
if (interactive) if (rpc_commands)
{ {
rpc_commands->stop_handling(); rpc_commands->stop_handling();
} }