From: Francis Dupont <fdupont@isc.org>
Date: Tue, 21 Mar 2017 19:08:02 +0000 (+0100)
Subject: [5150a] Changed module by app_name as it can be reserved on some C++ extensions
X-Git-Tag: trac5196_base~21^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a4e38252354e2b683474d5575ef6b155b6a287c3;p=thirdparty%2Fkea.git

[5150a] Changed module by app_name as it can be reserved on some C++ extensions
---

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.";
         }
     }