From ed6eb688d98cfe3135d48b189cb6efec6b23a9b4 Mon Sep 17 00:00:00 2001 From: NicJA Date: Fri, 19 Jun 2015 00:14:32 +0000 Subject: [PATCH] fix build when debug is enabled git-svn-id: https://svn.aros.org/svn/aros/trunk/AROS@50838 fb15a70f-31f2-0310-bbcc-cdcc74a49acc --- rom/oop/disposeobject.c | 7 +++---- rom/oop/newobject.c | 5 ++--- rom/oop/obtainattrbase.c | 8 ++++---- 3 files changed, 9 insertions(+), 11 deletions(-) diff --git a/rom/oop/disposeobject.c b/rom/oop/disposeobject.c index 941fc19214..ec9d1afc16 100644 --- a/rom/oop/disposeobject.c +++ b/rom/oop/disposeobject.c @@ -55,14 +55,13 @@ ULONG mid = OOP_GetMethodID(IID_Root, moRoot_Dispose); EnterFunc(bug("OOP_DisposeObject(classID=%s)\n", - OCLASS(obj)->ClassNode.ln_Name)); - + OOP_OCLASS(obj)->ClassNode.ln_Name)); + if (obj == NULL) return; OOP_DoMethod(obj, (OOP_Msg)&mid); - ReturnVoid("OOP_DisposeObject"); - + AROS_LIBFUNC_EXIT } /* OOP_DisposeObject */ diff --git a/rom/oop/newobject.c b/rom/oop/newobject.c index 671d2c2f23..9011295234 100644 --- a/rom/oop/newobject.c +++ b/rom/oop/newobject.c @@ -72,8 +72,8 @@ // bug("OOP_NewObject(class=%s, classptr=%p, tags=%p)\n", classID, classPtr, tagList); EnterFunc(bug("OOP_NewObject(classPtr=%p, classID=%s, tagList=%p)\n", - classPtr, ((classID != NULL) ? classID : "(null)"), tagList)); - + classPtr, ((classID != (CONST_STRPTR)NULL) ? classID : "(null)"), tagList)); + if (!classPtr) { /* If a public ID was given, find pointer to class */ @@ -105,7 +105,6 @@ /* Call the New() method of the specified class */ - D(bug("OOP_Coercemethod: %p\n", classPtr->CoerceMethod)); o = (OOP_Object *)OOP_CoerceMethod(classPtr, (OOP_Object *)classPtr, (OOP_Msg)&p); /* Release our temporary lock */ diff --git a/rom/oop/obtainattrbase.c b/rom/oop/obtainattrbase.c index 2f46391093..6c64bd84a0 100644 --- a/rom/oop/obtainattrbase.c +++ b/rom/oop/obtainattrbase.c @@ -129,7 +129,7 @@ } } } - + if (base) { /* Increase refcount of bucket */ @@ -137,9 +137,9 @@ } ReleaseSemaphore(&GetOBase(OOPBase)->ob_IIDTableLock); - - ReturnInt ("OOP_ObtainAttrBase", AttrBase, base); - + + ReturnInt ("OOP_ObtainAttrBase", OOP_AttrBase, base); + AROS_LIBFUNC_EXIT } /* OOP_ObtainAttrBase */ -- 2.11.4.GIT