From 2af04c7514ed84ece1c1dfdda7dfa289c833b4dc Mon Sep 17 00:00:00 2001 From: zarzuelo Date: Tue, 20 Nov 2012 12:39:11 +0000 Subject: [PATCH] 2012-11-20 Sergio Martin * pandora_windows_service.cc: Fixed some bugs of the type conversions git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7167 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- pandora_agents/win32/ChangeLog | 5 +++++ pandora_agents/win32/pandora_windows_service.cc | 17 ++++++++++------- 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/pandora_agents/win32/ChangeLog b/pandora_agents/win32/ChangeLog index cabd85e720..eb5952df87 100644 --- a/pandora_agents/win32/ChangeLog +++ b/pandora_agents/win32/ChangeLog @@ -1,3 +1,8 @@ +2012-11-20 Sergio Martin + + * pandora_windows_service.cc: Fixed some bugs + of the type conversions + 2012-11-20 Sergio Martin * pandora_windows_service.cc: Added support for diff --git a/pandora_agents/win32/pandora_windows_service.cc b/pandora_agents/win32/pandora_windows_service.cc index 1fea5bfd9a..3948578598 100644 --- a/pandora_agents/win32/pandora_windows_service.cc +++ b/pandora_agents/win32/pandora_windows_service.cc @@ -1336,10 +1336,12 @@ Pandora_Windows_Service::sendXml (Pandora_Module_List *modules) { /* Write custom fields */ int c = 1; - char numstr[21]; // enough to hold all numbers up to 64-bits - sprintf(numstr, "%d", c); - string token_name = conf->getValue ("custom_field"+numstr+"_name"); - string token_value = conf->getValue ("custom_field"+numstr+"_value"); + char custom_field_name_token[21]; // enough to hold all numbers up to 64-bits + char custom_field_value_token[21]; // enough to hold all numbers up to 64-bits + sprintf(custom_field_name_token, "custom_field%d_name", c); + sprintf(custom_field_value_token, "custom_field%d_value", c); + string token_name = conf->getValue (custom_field_name_token); + string token_value = conf->getValue (custom_field_value_token); if(token_name != "" && token_value != "") { data_xml += "\n"; @@ -1350,9 +1352,10 @@ Pandora_Windows_Service::sendXml (Pandora_Module_List *modules) { data_xml += " \n"; c++; - sprintf(numstr, "%d", c); - token_name = conf->getValue ("custom_field"+numstr+"_name"); - token_value = conf->getValue ("custom_field"+numstr+"_value"); + sprintf(custom_field_name_token, "custom_field%d_name", c); + sprintf(custom_field_value_token, "custom_field%d_value", c); + token_name = conf->getValue (custom_field_name_token); + token_value = conf->getValue (custom_field_value_token); } data_xml += "\n"; }