Remove unused argument 'async'

refs #9972

diff --git a/lib/cli/consolecommand.cpp b/lib/cli/consolecommand.cpp
index 690fcc14e88d4b80a318e17cfb770f60f8babe63..e7b96b968840e8f0ee04fabb4aed6153f770ce2a 100644 (file)
--- a/lib/cli/consolecommand.cpp
+++ b/lib/cli/consolecommand.cpp
@@ -106,7 +106,7 @@ static char *ConsoleCompleteHelper(const char *word, int state)
                        Value value;
 
                        try {
-                               Expression *expr = ConfigCompiler::CompileText("temp", pword, false);
+                               Expression *expr = ConfigCompiler::CompileText("temp", pword);
 
                                if (expr)
                                        value = expr->Evaluate(*l_ScriptFrame);
@@ -238,7 +238,7 @@ incomplete:
                        try {
                                lines[fileName] = command;
 
-                               expr = ConfigCompiler::CompileText(fileName, command, false);
+                               expr = ConfigCompiler::CompileText(fileName, command);
 
                                if (expr) {
                                        Value result = expr->Evaluate(scriptFrame);

diff --git a/lib/cli/daemonutility.cpp b/lib/cli/daemonutility.cpp
index e98133387a122bd1f388ed5ca3caaf12d86bf458..8068a7331f0fb815531e72092016f658ef4559e9 100644 (file)
--- a/lib/cli/daemonutility.cpp
+++ b/lib/cli/daemonutility.cpp
@@ -74,7 +74,7 @@ static void IncludeModule(const String& modulePath, bool& success)
        
        if (Utility::PathExists(modulePath + "/include.conf")) {
                Expression *expr = ConfigCompiler::CompileFile(modulePath + "/include.conf",
-                   true, String(), moduleName);
+                   String(), moduleName);
                
                if (!ExecuteExpression(expr))
                        success = false;
@@ -91,7 +91,7 @@ bool DaemonUtility::ValidateConfigFiles(const std::vector<std::string>& configs,
 
        if (!configs.empty()) {
                BOOST_FOREACH(const String& configPath, configs) {
-                       Expression *expression = ConfigCompiler::CompileFile(configPath, true, String(), "_etc");
+                       Expression *expression = ConfigCompiler::CompileFile(configPath, String(), "_etc");
                        success = ExecuteExpression(expression);
                        delete expression;
                        if (!success)

diff --git a/lib/config/configcompiler.cpp b/lib/config/configcompiler.cpp
index 1021b54d0f2fddd2fc7e65f6406ea175e57c867a..05c4950919f9f6a0820709c151f86284eb256658 100644 (file)
--- a/lib/config/configcompiler.cpp
+++ b/lib/config/configcompiler.cpp
@@ -113,7 +113,7 @@ String ConfigCompiler::GetModule(void) const
 void ConfigCompiler::CollectIncludes(std::vector<Expression *>& expressions,
     const String& file, const String& zone, const String& module)
 {
-       expressions.push_back(CompileFile(file, true, zone, module));
+       expressions.push_back(CompileFile(file, zone, module));
 }
 
 /**
@@ -235,7 +235,7 @@ void ConfigCompiler::HandleLibrary(const String& library)
  * @returns Configuration items.
  */
 Expression *ConfigCompiler::CompileStream(const String& path,
-    std::istream *stream, bool async, const String& zone, const String& module)
+    std::istream *stream, const String& zone, const String& module)
 {
        CONTEXT("Compiling configuration stream with name '" + path + "'");
 
@@ -258,8 +258,8 @@ Expression *ConfigCompiler::CompileStream(const String& path,
  * @param path The path.
  * @returns Configuration items.
  */
-Expression *ConfigCompiler::CompileFile(const String& path, bool async,
-    const String& zone, const String& module)
+Expression *ConfigCompiler::CompileFile(const String& path, const String& zone,
+    const String& module)
 {
        CONTEXT("Compiling configuration file '" + path + "'");
 
@@ -274,7 +274,7 @@ Expression *ConfigCompiler::CompileFile(const String& path, bool async,
        Log(LogInformation, "ConfigCompiler")
            << "Compiling config file: " << path;
 
-       return CompileStream(path, &stream, async, zone, module);
+       return CompileStream(path, &stream, zone, module);
 }
 
 /**
@@ -285,10 +285,10 @@ Expression *ConfigCompiler::CompileFile(const String& path, bool async,
  * @returns Configuration items.
  */
 Expression *ConfigCompiler::CompileText(const String& path, const String& text,
-    bool async, const String& zone, const String& module)
+    const String& zone, const String& module)
 {
        std::stringstream stream(text);
-       return CompileStream(path, &stream, async, zone, module);
+       return CompileStream(path, &stream, zone, module);
 }
 
 /**

diff --git a/lib/config/configcompiler.hpp b/lib/config/configcompiler.hpp
index 41d9815859958a576976facd6f7feb52bf0119ce..7df8e395195180a57e3091deb141ca7b0b88f3f7 100644 (file)
--- a/lib/config/configcompiler.hpp
+++ b/lib/config/configcompiler.hpp
@@ -86,11 +86,11 @@ public:
        Expression *Compile(void);
 
        static Expression *CompileStream(const String& path, std::istream *stream,
-           bool async = true, const String& zone = String(), const String& module = String());
-       static Expression *CompileFile(const String& path, bool async = true,
            const String& zone = String(), const String& module = String());
+       static Expression *CompileFile(const String& path, const String& zone = String(),
+           const String& module = String());
        static Expression *CompileText(const String& path, const String& text,
-           bool async = true, const String& zone = String(), const String& module = String());
+           const String& zone = String(), const String& module = String());
 
        static void AddIncludeSearchDir(const String& dir);
 

diff --git a/lib/config/configfragment.hpp b/lib/config/configfragment.hpp
index 2000d8169388a5ef9bea74e337278d54edec9769..43fd7ec1dc02683051450e3d3c736091526d90e5 100644 (file)
--- a/lib/config/configfragment.hpp
+++ b/lib/config/configfragment.hpp
@@ -28,7 +28,7 @@
        namespace { \
                void RegisterConfigFragment(void) \
                { \
-                       icinga::Expression *expression = icinga::ConfigCompiler::CompileText(name, fragment, false); \
+                       icinga::Expression *expression = icinga::ConfigCompiler::CompileText(name, fragment); \
                        VERIFY(expression); \
                        icinga::ScriptFrame frame; \
                        expression->Evaluate(frame); \

diff --git a/lib/livestatus/livestatusquery.cpp b/lib/livestatus/livestatusquery.cpp
index e34da40aae4f08dfce55a70b41d3af2141dee001..863e18f932683c93ace6c59421045fd45cc202af 100644 (file)
--- a/lib/livestatus/livestatusquery.cpp
+++ b/lib/livestatus/livestatusquery.cpp
@@ -633,7 +633,7 @@ void LivestatusQuery::ExecuteScriptHelper(const Stream::Ptr& stream)
        Expression *expr = NULL;
        Value result;
        try {
-               expr = ConfigCompiler::CompileText(fileName, m_Command, false);
+               expr = ConfigCompiler::CompileText(fileName, m_Command);
                ScriptFrame frame;
                frame.Locals = lsf.Locals;
                frame.Self = lsf.Locals;

diff --git a/lib/remote/filterutility.cpp b/lib/remote/filterutility.cpp
index 4c03cbd50ff15f2ac3f5f8eec5a666efb84ed4cf..1939dcf4049587d346cf4b60cfc2a02c6dfa6f38 100644 (file)
--- a/lib/remote/filterutility.cpp
+++ b/lib/remote/filterutility.cpp
@@ -114,7 +114,7 @@ std::vector<ConfigObject::Ptr> FilterUtility::GetFilterTargets(const QueryDescri
                ConfigType::Ptr dtype = ConfigType::GetByName(type);
                ASSERT(dtype);
 
-               Expression *ufilter = ConfigCompiler::CompileText("<API query>", filter, false);
+               Expression *ufilter = ConfigCompiler::CompileText("<API query>", filter);
                ScriptFrame frame;
                frame.Sandboxed = true;