tyler.durden/icinga2
1
0
Fork 0
mirror of https://github.com/Icinga/icinga2.git synced 2025-07-27 15:44:11 +02:00
Code Issues Packages Projects Releases Wiki Activity

macros: fix param name for ResolveMacros

Browse Source
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; 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) const Dictionary::Ptr& cr, const MacroProcessor::EscapeCallback& escapeFn)
{ {
Value result; Value result;
if (cmd.IsScalar()) { if (str.IsScalar()) {
result = InternalResolveMacros(cmd, resolvers, cr, escapeFn); result = InternalResolveMacros(str, resolvers, cr, escapeFn);
} else if (cmd.IsObjectType<Array>()) { } else if (str.IsObjectType<Array>()) {
Array::Ptr resultArr = boost::make_shared<Array>(); Array::Ptr resultArr = boost::make_shared<Array>();
Array::Ptr arr = cmd; Array::Ptr arr = str;
ObjectLock olock(arr); ObjectLock olock(arr);