From 56d743552d6cef08ab22571ceb3fae126b40f348 Mon Sep 17 00:00:00 2001 From: "Ruben S. Montero" Date: Wed, 22 Apr 2015 17:32:55 +0200 Subject: [PATCH] feature #3654: Recover lcm_state_to_str interface (cherry picked from commit c328fc076d23c26d436c8280b4822b778691a893) --- include/VirtualMachine.h | 4 +--- src/vm/VirtualMachineHook.cc | 4 +++- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/VirtualMachine.h b/include/VirtualMachine.h index 4422c25322..abf610d1f2 100644 --- a/include/VirtualMachine.h +++ b/include/VirtualMachine.h @@ -204,10 +204,8 @@ public: return 0; } - static string lcm_state_to_str(LcmState state) + static string& lcm_state_to_str(string& st, LcmState state) { - string st; - switch (state) { case LCM_INIT: st = "LCM_INIT"; break; diff --git a/src/vm/VirtualMachineHook.cc b/src/vm/VirtualMachineHook.cc index cc2b55fe76..8697f10997 100644 --- a/src/vm/VirtualMachineHook.cc +++ b/src/vm/VirtualMachineHook.cc @@ -88,6 +88,8 @@ void VirtualMachineStateHook::parse_hook_arguments(PoolObjectSQL * obj, if ( found != string::npos ) { - parsed.replace(found, 15, VirtualMachine::lcm_state_to_str(prev_lcm)); + string str; + + parsed.replace(found, 15, VirtualMachine::lcm_state_to_str(str, prev_lcm)); } }