From 6f155f4f53fb5a37882dcfec86b8f7b0e14340a4 Mon Sep 17 00:00:00 2001 From: John Spray Date: Sat, 4 Feb 2017 21:19:23 +0000 Subject: [PATCH] mon: make MonClient::start_mon_command return void The int return was misleading because it didn't really have any error cases. We sometimes use ints in APIs in case we want to return an error in future, but MonClient is an internal interface. Signed-off-by: John Spray --- src/mon/MonClient.cc | 11 +++-------- src/mon/MonClient.h | 6 +++--- 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/src/mon/MonClient.cc b/src/mon/MonClient.cc index c685996a8e64c..71721a0043dad 100644 --- a/src/mon/MonClient.cc +++ b/src/mon/MonClient.cc @@ -1028,7 +1028,7 @@ void MonClient::_finish_command(MonCommand *r, int ret, string rs) delete r; } -int MonClient::start_mon_command(const vector& cmd, +void MonClient::start_mon_command(const vector& cmd, const bufferlist& inbl, bufferlist *outbl, string *outs, Context *onfinish) @@ -1056,11 +1056,9 @@ int MonClient::start_mon_command(const vector& cmd, } mon_commands[r->tid] = r; _send_command(r); - // can't fail - return 0; } -int MonClient::start_mon_command(const string &mon_name, +void MonClient::start_mon_command(const string &mon_name, const vector& cmd, const bufferlist& inbl, bufferlist *outbl, string *outs, @@ -1076,11 +1074,9 @@ int MonClient::start_mon_command(const string &mon_name, r->onfinish = onfinish; mon_commands[r->tid] = r; _send_command(r); - // can't fail - return 0; } -int MonClient::start_mon_command(int rank, +void MonClient::start_mon_command(int rank, const vector& cmd, const bufferlist& inbl, bufferlist *outbl, string *outs, @@ -1096,7 +1092,6 @@ int MonClient::start_mon_command(int rank, r->onfinish = onfinish; mon_commands[r->tid] = r; _send_command(r); - return 0; } // --------- diff --git a/src/mon/MonClient.h b/src/mon/MonClient.h index 6a154fc6fce7c..bcd6d517a012d 100644 --- a/src/mon/MonClient.h +++ b/src/mon/MonClient.h @@ -439,14 +439,14 @@ private: void handle_mon_command_ack(MMonCommandAck *ack); public: - int start_mon_command(const vector& cmd, const bufferlist& inbl, + void start_mon_command(const vector& cmd, const bufferlist& inbl, bufferlist *outbl, string *outs, Context *onfinish); - int start_mon_command(int mon_rank, + void start_mon_command(int mon_rank, const vector& cmd, const bufferlist& inbl, bufferlist *outbl, string *outs, Context *onfinish); - int start_mon_command(const string &mon_name, ///< mon name, with mon. prefix + void start_mon_command(const string &mon_name, ///< mon name, with mon. prefix const vector& cmd, const bufferlist& inbl, bufferlist *outbl, string *outs, Context *onfinish); -- 2.39.5