From 1be3ef95295b43afa3d5a55198138e74202afe67 Mon Sep 17 00:00:00 2001 From: Daniele Sciascia Date: Wed, 19 Dec 2018 16:00:31 +0100 Subject: [PATCH] Expose to_c_string() function for wsrep::view::status --- include/wsrep/view.hpp | 11 +++++++++++ src/view.cpp | 15 +-------------- 2 files changed, 12 insertions(+), 14 deletions(-) diff --git a/include/wsrep/view.hpp b/include/wsrep/view.hpp index 9913db5..55bd136 100644 --- a/include/wsrep/view.hpp +++ b/include/wsrep/view.hpp @@ -140,6 +140,17 @@ namespace wsrep { v.print(os); return os; } + + static inline const char* to_c_string(enum wsrep::view::status status) + { + switch(status) + { + case wsrep::view::primary: return "primary"; + case wsrep::view::non_primary: return "non-primary"; + case wsrep::view::disconnected: return "disconnected"; + } + return "invalid status"; + } } #endif // WSREP_VIEW diff --git a/src/view.cpp b/src/view.cpp index 9bea0e6..e65442f 100644 --- a/src/view.cpp +++ b/src/view.cpp @@ -33,23 +33,10 @@ int wsrep::view::member_index(const wsrep::id& member_id) const return -1; } -static const char* view_status_str(enum wsrep::view::status s) -{ - switch(s) - { - case wsrep::view::primary: return "PRIMARY"; - case wsrep::view::non_primary: return "NON-PRIMARY"; - case wsrep::view::disconnected: return "DISCONNECTED"; - } - - assert(0); - return "invalid status"; -} - void wsrep::view::print(std::ostream& os) const { os << " id: " << state_id() << "\n" - << " status: " << view_status_str(status()) << "\n" + << " status: " << to_c_string(status()) << "\n" << " prococol_version: " << protocol_version() << "\n" << " capabilities: " << provider::capability::str(capabilities())<<"\n" << " final: " << (final() ? "yes" : "no") << "\n"