Rename macro RequireNotNull to REQUIRE_NOT_NULL

Icinga · Feb 21, 2018 · 7b1d9ed · 7b1d9ed
1 parent 7aa5e54
commit 7b1d9ed
Show file tree

Hide file tree

Showing 23 changed files with 61 additions and 61 deletions.
diff --git a/lib/base/array-script.cpp b/lib/base/array-script.cpp
@@ -30,55 +30,55 @@ static double ArrayLen()
 {
 	ScriptFrame *vframe = ScriptFrame::GetCurrentFrame();
 	Array::Ptr self = static_cast<Array::Ptr>(vframe->Self);
-	RequireNotNull(self);
+	REQUIRE_NOT_NULL(self);
 	return self->GetLength();
 }
 
 static void ArraySet(int index, const Value& value)
 {
 	ScriptFrame *vframe = ScriptFrame::GetCurrentFrame();
 	Array::Ptr self = static_cast<Array::Ptr>(vframe->Self);
-	RequireNotNull(self);
+	REQUIRE_NOT_NULL(self);
 	self->Set(index, value);
 }
 
 static Value ArrayGet(int index)
 {
 	ScriptFrame *vframe = ScriptFrame::GetCurrentFrame();
 	Array::Ptr self = static_cast<Array::Ptr>(vframe->Self);
-	RequireNotNull(self);
+	REQUIRE_NOT_NULL(self);
 	return self->Get(index);
 }
 
 static void ArrayAdd(const Value& value)
 {
 	ScriptFrame *vframe = ScriptFrame::GetCurrentFrame();
 	Array::Ptr self = static_cast<Array::Ptr>(vframe->Self);
-	RequireNotNull(self);
+	REQUIRE_NOT_NULL(self);
 	self->Add(value);
 }
 
 static void ArrayRemove(int index)
 {
 	ScriptFrame *vframe = ScriptFrame::GetCurrentFrame();
 	Array::Ptr self = static_cast<Array::Ptr>(vframe->Self);
-	RequireNotNull(self);
+	REQUIRE_NOT_NULL(self);
 	self->Remove(index);
 }
 
 static bool ArrayContains(const Value& value)
 {
 	ScriptFrame *vframe = ScriptFrame::GetCurrentFrame();
 	Array::Ptr self = static_cast<Array::Ptr>(vframe->Self);
-	RequireNotNull(self);
+	REQUIRE_NOT_NULL(self);
 	return self->Contains(value);
 }
 
 static void ArrayClear()
 {
 	ScriptFrame *vframe = ScriptFrame::GetCurrentFrame();
 	Array::Ptr self = static_cast<Array::Ptr>(vframe->Self);
-	RequireNotNull(self);
+	REQUIRE_NOT_NULL(self);
 	self->Clear();
 }
 
@@ -91,7 +91,7 @@ static Array::Ptr ArraySort(const std::vector<Value>& args)
 {
 	ScriptFrame *vframe = ScriptFrame::GetCurrentFrame();
 	Array::Ptr self = static_cast<Array::Ptr>(vframe->Self);
-	RequireNotNull(self);
+	REQUIRE_NOT_NULL(self);
 
 	Array::Ptr arr = self->ShallowClone();
 
@@ -115,15 +115,15 @@ static Array::Ptr ArrayShallowClone()
 {
 	ScriptFrame *vframe = ScriptFrame::GetCurrentFrame();
 	Array::Ptr self = static_cast<Array::Ptr>(vframe->Self);
-	RequireNotNull(self);
+	REQUIRE_NOT_NULL(self);
 	return self->ShallowClone();
 }
 
 static Value ArrayJoin(const Value& separator)
 {
 	ScriptFrame *vframe = ScriptFrame::GetCurrentFrame();
 	Array::Ptr self = static_cast<Array::Ptr>(vframe->Self);
-	RequireNotNull(self);
+	REQUIRE_NOT_NULL(self);
 
 	Value result;
 	bool first = true;
@@ -146,15 +146,15 @@ static Array::Ptr ArrayReverse()
 {
 	ScriptFrame *vframe = ScriptFrame::GetCurrentFrame();
 	Array::Ptr self = static_cast<Array::Ptr>(vframe->Self);
-	RequireNotNull(self);
+	REQUIRE_NOT_NULL(self);
 	return self->Reverse();
 }
 
 static Array::Ptr ArrayMap(const Function::Ptr& function)
 {
 	ScriptFrame *vframe = ScriptFrame::GetCurrentFrame();
 	Array::Ptr self = static_cast<Array::Ptr>(vframe->Self);
-	RequireNotNull(self);
+	REQUIRE_NOT_NULL(self);
 
 	if (vframe->Sandboxed && !function->IsSideEffectFree())
 		BOOST_THROW_EXCEPTION(ScriptError("Map function must be side-effect free."));
@@ -173,7 +173,7 @@ static Value ArrayReduce(const Function::Ptr& function)
 {
 	ScriptFrame *vframe = ScriptFrame::GetCurrentFrame();
 	Array::Ptr self = static_cast<Array::Ptr>(vframe->Self);
-	RequireNotNull(self);
+	REQUIRE_NOT_NULL(self);
 
 	if (vframe->Sandboxed && !function->IsSideEffectFree())
 		BOOST_THROW_EXCEPTION(ScriptError("Reduce function must be side-effect free."));
@@ -195,7 +195,7 @@ static Array::Ptr ArrayFilter(const Function::Ptr& function)
 {
 	ScriptFrame *vframe = ScriptFrame::GetCurrentFrame();
 	Array::Ptr self = static_cast<Array::Ptr>(vframe->Self);
-	RequireNotNull(self);
+	REQUIRE_NOT_NULL(self);
 
 	if (vframe->Sandboxed && !function->IsSideEffectFree())
 		BOOST_THROW_EXCEPTION(ScriptError("Filter function must be side-effect free."));
@@ -215,7 +215,7 @@ static bool ArrayAny(const Function::Ptr& function)
 {
 	ScriptFrame *vframe = ScriptFrame::GetCurrentFrame();
 	Array::Ptr self = static_cast<Array::Ptr>(vframe->Self);
-	RequireNotNull(self);
+	REQUIRE_NOT_NULL(self);
 
 	if (vframe->Sandboxed && !function->IsSideEffectFree())
 		BOOST_THROW_EXCEPTION(ScriptError("Filter function must be side-effect free."));
@@ -233,7 +233,7 @@ static bool ArrayAll(const Function::Ptr& function)
 {
 	ScriptFrame *vframe = ScriptFrame::GetCurrentFrame();
 	Array::Ptr self = static_cast<Array::Ptr>(vframe->Self);
-	RequireNotNull(self);
+	REQUIRE_NOT_NULL(self);
 
 	if (vframe->Sandboxed && !function->IsSideEffectFree())
 		BOOST_THROW_EXCEPTION(ScriptError("Filter function must be side-effect free."));
@@ -250,7 +250,7 @@ static Array::Ptr ArrayUnique()
 {
 	ScriptFrame *vframe = ScriptFrame::GetCurrentFrame();
 	Array::Ptr self = static_cast<Array::Ptr>(vframe->Self);
-	RequireNotNull(self);
+	REQUIRE_NOT_NULL(self);
 
 	std::set<Value> result;
 

diff --git a/lib/base/configobject-script.cpp b/lib/base/configobject-script.cpp
@@ -29,15 +29,15 @@ static void ConfigObjectModifyAttribute(const String& attr, const Value& value)
 {
 	ScriptFrame *vframe = ScriptFrame::GetCurrentFrame();
 	ConfigObject::Ptr self = vframe->Self;
-	RequireNotNull(self);
+	REQUIRE_NOT_NULL(self);
 	return self->ModifyAttribute(attr, value);
 }
 
 static void ConfigObjectRestoreAttribute(const String& attr)
 {
 	ScriptFrame *vframe = ScriptFrame::GetCurrentFrame();
 	ConfigObject::Ptr self = vframe->Self;
-	RequireNotNull(self);
+	REQUIRE_NOT_NULL(self);
 	return self->RestoreAttribute(attr);
 }
 

diff --git a/lib/base/datetime-script.cpp b/lib/base/datetime-script.cpp
@@ -29,7 +29,7 @@ static String DateTimeFormat(const String& format)
 {
 	ScriptFrame *vframe = ScriptFrame::GetCurrentFrame();
 	DateTime::Ptr self = static_cast<DateTime::Ptr>(vframe->Self);
-	RequireNotNull(self);
+	REQUIRE_NOT_NULL(self);
 
 	return self->Format(format);
 }

diff --git a/lib/base/dictionary-script.cpp b/lib/base/dictionary-script.cpp
@@ -29,55 +29,55 @@ static double DictionaryLen()
 {
 	ScriptFrame *vframe = ScriptFrame::GetCurrentFrame();
 	Dictionary::Ptr self = static_cast<Dictionary::Ptr>(vframe->Self);
-	RequireNotNull(self);
+	REQUIRE_NOT_NULL(self);
 	return self->GetLength();
 }
 
 static void DictionarySet(const String& key, const Value& value)
 {
 	ScriptFrame *vframe = ScriptFrame::GetCurrentFrame();
 	Dictionary::Ptr self = static_cast<Dictionary::Ptr>(vframe->Self);
-	RequireNotNull(self);
+	REQUIRE_NOT_NULL(self);
 	self->Set(key, value);
 }
 
 static Value DictionaryGet(const String& key)
 {
 	ScriptFrame *vframe = ScriptFrame::GetCurrentFrame();
 	Dictionary::Ptr self = static_cast<Dictionary::Ptr>(vframe->Self);
-	RequireNotNull(self);
+	REQUIRE_NOT_NULL(self);
 	return self->Get(key);
 }
 
 static void DictionaryRemove(const String& key)
 {
 	ScriptFrame *vframe = ScriptFrame::GetCurrentFrame();
 	Dictionary::Ptr self = static_cast<Dictionary::Ptr>(vframe->Self);
-	RequireNotNull(self);
+	REQUIRE_NOT_NULL(self);
 	self->Remove(key);
 }
 
 static bool DictionaryContains(const String& key)
 {
 	ScriptFrame *vframe = ScriptFrame::GetCurrentFrame();
 	Dictionary::Ptr self = static_cast<Dictionary::Ptr>(vframe->Self);
-	RequireNotNull(self);
+	REQUIRE_NOT_NULL(self);
 	return self->Contains(key);
 }
 
 static Dictionary::Ptr DictionaryShallowClone()
 {
 	ScriptFrame *vframe = ScriptFrame::GetCurrentFrame();
 	Dictionary::Ptr self = static_cast<Dictionary::Ptr>(vframe->Self);
-	RequireNotNull(self);
+	REQUIRE_NOT_NULL(self);
 	return self->ShallowClone();
 }
 
 static Array::Ptr DictionaryKeys()
 {
 	ScriptFrame *vframe = ScriptFrame::GetCurrentFrame();
 	Dictionary::Ptr self = static_cast<Dictionary::Ptr>(vframe->Self);
-	RequireNotNull(self);
+	REQUIRE_NOT_NULL(self);
 
 	ArrayData keys;
 	ObjectLock olock(self);
@@ -91,7 +91,7 @@ static Array::Ptr DictionaryValues()
 {
 	ScriptFrame *vframe = ScriptFrame::GetCurrentFrame();
 	Dictionary::Ptr self = static_cast<Dictionary::Ptr>(vframe->Self);
-	RequireNotNull(self);
+	REQUIRE_NOT_NULL(self);
 
 	ArrayData values;
 	ObjectLock olock(self);

diff --git a/lib/base/function-script.cpp b/lib/base/function-script.cpp
@@ -32,7 +32,7 @@ static Value FunctionCall(const std::vector<Value>& args)
 
 	ScriptFrame *vframe = ScriptFrame::GetCurrentFrame();
 	Function::Ptr self = static_cast<Function::Ptr>(vframe->Self);
-	RequireNotNull(self);
+	REQUIRE_NOT_NULL(self);
 
 	std::vector<Value> uargs(args.begin() + 1, args.end());
 	return self->InvokeThis(args[0], uargs);
@@ -42,7 +42,7 @@ static Value FunctionCallV(const Value& thisArg, const Array::Ptr& args)
 {
 	ScriptFrame *vframe = ScriptFrame::GetCurrentFrame();
 	Function::Ptr self = static_cast<Function::Ptr>(vframe->Self);
-	RequireNotNull(self);
+	REQUIRE_NOT_NULL(self);
 
 	std::vector<Value> uargs;
 

diff --git a/lib/base/object-script.cpp b/lib/base/object-script.cpp
@@ -29,23 +29,23 @@ static String ObjectToString()
 {
 	ScriptFrame *vframe = ScriptFrame::GetCurrentFrame();
 	Object::Ptr self = static_cast<Object::Ptr>(vframe->Self);
-	RequireNotNull(self);
+	REQUIRE_NOT_NULL(self);
 	return self->ToString();
 }
 
 static void ObjectNotifyAttribute(const String& attribute)
 {
 	ScriptFrame *vframe = ScriptFrame::GetCurrentFrame();
 	Object::Ptr self = static_cast<Object::Ptr>(vframe->Self);
-	RequireNotNull(self);
+	REQUIRE_NOT_NULL(self);
 	self->NotifyField(self->GetReflectionType()->GetFieldId(attribute));
 }
 
 static Object::Ptr ObjectClone()
 {
 	ScriptFrame *vframe = ScriptFrame::GetCurrentFrame();
 	Object::Ptr self = static_cast<Object::Ptr>(vframe->Self);
-	RequireNotNull(self);
+	REQUIRE_NOT_NULL(self);
 	return self->Clone();
 }
 

diff --git a/lib/base/object.cpp b/lib/base/object.cpp
@@ -295,4 +295,4 @@ void icinga::RequireNotNullInternal(const intrusive_ptr<Object>& object, const c
 {
 	if (!object)
 		BOOST_THROW_EXCEPTION(std::invalid_argument("Pointer must not be null: " + String(description)));
-}
+}
diff --git a/lib/base/object.hpp b/lib/base/object.hpp
@@ -57,7 +57,7 @@ extern Value Empty;
 	DECLARE_PTR_TYPEDEFS(klass); \
 	IMPL_TYPE_LOOKUP();
 
-#define RequireNotNull(ptr) RequireNotNullInternal(ptr, #ptr)
+#define REQUIRE_NOT_NULL(ptr) RequireNotNullInternal(ptr, #ptr)
 
 void RequireNotNullInternal(const intrusive_ptr<Object>& object, const char *description);
 

diff --git a/lib/base/typetype-script.cpp b/lib/base/typetype-script.cpp
@@ -35,7 +35,7 @@ static void TypeRegisterAttributeHandler(const String& fieldName, const Function
 {
 	ScriptFrame *vframe = ScriptFrame::GetCurrentFrame();
 	Type::Ptr self = static_cast<Type::Ptr>(vframe->Self);
-	RequireNotNull(self);
+	REQUIRE_NOT_NULL(self);
 
 	int fid = self->GetFieldId(fieldName);
 	self->RegisterAttributeHandler(fid, std::bind(&InvokeAttributeHandlerHelper, callback, _1, _2));

diff --git a/lib/icinga/checkable-script.cpp b/lib/icinga/checkable-script.cpp
@@ -30,7 +30,7 @@ static void CheckableProcessCheckResult(const CheckResult::Ptr& cr)
 {
 	ScriptFrame *vframe = ScriptFrame::GetCurrentFrame();
 	Checkable::Ptr self = vframe->Self;
-	RequireNotNull(self);
+	REQUIRE_NOT_NULL(self);
 	self->ProcessCheckResult(cr);
 }
 

diff --git a/lib/icinga/macroprocessor.cpp b/lib/icinga/macroprocessor.cpp
@@ -38,7 +38,7 @@ Value MacroProcessor::ResolveMacros(const Value& str, const ResolverList& resolv
 	bool useResolvedMacros, int recursionLevel)
 {
 	if (useResolvedMacros)
-		RequireNotNull(resolvedMacros);
+		REQUIRE_NOT_NULL(resolvedMacros);
 
 	Value result;
 
@@ -440,7 +440,7 @@ Value MacroProcessor::ResolveArguments(const Value& command, const Dictionary::P
 	const Dictionary::Ptr& resolvedMacros, bool useResolvedMacros, int recursionLevel)
 {
 	if (useResolvedMacros)
-		RequireNotNull(resolvedMacros);
+		REQUIRE_NOT_NULL(resolvedMacros);
 
 	Value resolvedCommand;
 	if (!arguments || command.IsObjectType<Array>() || command.IsObjectType<Function>())

diff --git a/lib/methods/clusterchecktask.cpp b/lib/methods/clusterchecktask.cpp
@@ -38,8 +38,8 @@ REGISTER_SCRIPTFUNCTION_NS(Internal, ClusterCheck, &ClusterCheckTask::ScriptFunc
 void ClusterCheckTask::ScriptFunc(const Checkable::Ptr& checkable, const CheckResult::Ptr& cr,
 	const Dictionary::Ptr& resolvedMacros, bool useResolvedMacros)
 {
-	RequireNotNull(checkable);
-	RequireNotNull(cr);
+	REQUIRE_NOT_NULL(checkable);
+	REQUIRE_NOT_NULL(cr);
 
 	if (resolvedMacros && !useResolvedMacros)
 		return;

diff --git a/lib/methods/clusterzonechecktask.cpp b/lib/methods/clusterzonechecktask.cpp
@@ -34,8 +34,8 @@ REGISTER_SCRIPTFUNCTION_NS(Internal, ClusterZoneCheck, &ClusterZoneCheckTask::Sc
 void ClusterZoneCheckTask::ScriptFunc(const Checkable::Ptr& checkable, const CheckResult::Ptr& cr,
 	const Dictionary::Ptr& resolvedMacros, bool useResolvedMacros)
 {
-	RequireNotNull(checkable);
-	RequireNotNull(cr);
+	REQUIRE_NOT_NULL(checkable);
+	REQUIRE_NOT_NULL(cr);
 
 	ApiListener::Ptr listener = ApiListener::GetInstance();
 

diff --git a/lib/methods/dummychecktask.cpp b/lib/methods/dummychecktask.cpp
@@ -36,8 +36,8 @@ REGISTER_SCRIPTFUNCTION_NS(Internal, DummyCheck, &DummyCheckTask::ScriptFunc, "c
 void DummyCheckTask::ScriptFunc(const Checkable::Ptr& checkable, const CheckResult::Ptr& cr,
 	const Dictionary::Ptr& resolvedMacros, bool useResolvedMacros)
 {
-	RequireNotNull(checkable);
-	RequireNotNull(cr);
+	REQUIRE_NOT_NULL(checkable);
+	REQUIRE_NOT_NULL(cr);
 
 	CheckCommand::Ptr commandObj = checkable->GetCheckCommand();
 

diff --git a/lib/methods/exceptionchecktask.cpp b/lib/methods/exceptionchecktask.cpp
@@ -34,8 +34,8 @@ REGISTER_SCRIPTFUNCTION_NS(Internal, ExceptionCheck, &ExceptionCheckTask::Script
 void ExceptionCheckTask::ScriptFunc(const Checkable::Ptr& checkable, const CheckResult::Ptr& cr,
 	const Dictionary::Ptr& resolvedMacros, bool useResolvedMacros)
 {
-	RequireNotNull(checkable);
-	RequireNotNull(cr);
+	REQUIRE_NOT_NULL(checkable);
+	REQUIRE_NOT_NULL(cr);
 
 	if (resolvedMacros && !useResolvedMacros)
 		return;