tyler.durden
/
icinga2
mirror of https://github.com/Icinga/icinga2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

macros: fix param name for ResolveMacros

This commit is contained in:
Michael Friedrich 2013-07-16 17:11:18 +02:00
parent 917f7d363b
commit ccd60bbc4b
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/icinga/macroprocessor.cpp
View File

@ -29,16 +29,16 @@
using namespace icinga;
Value MacroProcessor::ResolveMacros(const Value& cmd, const std::vector<MacroResolver::Ptr>& resolvers,
Value MacroProcessor::ResolveMacros(const Value& str, const std::vector<MacroResolver::Ptr>& resolvers,
const Dictionary::Ptr& cr, const MacroProcessor::EscapeCallback& escapeFn)
{
Value result;
if (cmd.IsScalar()) {
result = InternalResolveMacros(cmd, resolvers, cr, escapeFn);
} else if (cmd.IsObjectType<Array>()) {
if (str.IsScalar()) {
result = InternalResolveMacros(str, resolvers, cr, escapeFn);
} else if (str.IsObjectType<Array>()) {
Array::Ptr resultArr = boost::make_shared<Array>();
Array::Ptr arr = cmd;
Array::Ptr arr = str;
ObjectLock olock(arr);