From a4e38252354e2b683474d5575ef6b155b6a287c3 Mon Sep 17 00:00:00 2001 From: Francis Dupont Date: Tue, 21 Mar 2017 20:08:02 +0100 Subject: [PATCH] [5150a] Changed module by app_name as it can be reserved on some C++ extensions --- src/lib/process/d_controller.cc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/lib/process/d_controller.cc b/src/lib/process/d_controller.cc index 3f8c97d4d4..5f64064e1f 100644 --- a/src/lib/process/d_controller.cc +++ b/src/lib/process/d_controller.cc @@ -491,7 +491,7 @@ ConstElementPtr DControllerBase::configTestHandler(const std::string&, ConstElementPtr args) { const int status_code = COMMAND_ERROR; // 1 indicates an error ConstElementPtr module_config; - std::string module = getAppName(); + std::string app_name = getAppName(); std::string message; // Command arguments are expected to be: @@ -501,11 +501,11 @@ DControllerBase::configTestHandler(const std::string&, ConstElementPtr args) { if (!args) { message = "Missing mandatory 'arguments' parameter."; } else { - module_config = args->get(module); + module_config = args->get(app_name); if (!module_config) { - message = "Missing mandatory '" + module + "' parameter."; + message = "Missing mandatory '" + app_name + "' parameter."; } else if (module_config->getType() != Element::map) { - message = "'" + module + "' parameter expected to be a map."; + message = "'" + app_name + "' parameter expected to be a map."; } } -- 2.47.3