[Vm-dev] [commit][3695] Nicolas Cellier a NULL plugin name fix

[commits at squeakvm.org]

Revision: 3695
Author:   johnmci
Date:     2016-05-05 09:24:39 -0700 (Thu, 05 May 2016)
Log Message:
-----------
Nicolas Cellier a NULL plugin name fix

Modified Paths:
--------------
    branches/Cog/platforms/iOS/vm/OSX/sqMacUnixExternalPrims.m
    branches/Cog/platforms/iOS/vm/SqueakPureObjc_Prefix.pch

Modified: branches/Cog/platforms/iOS/vm/OSX/sqMacUnixExternalPrims.m
===================================================================
--- branches/Cog/platforms/iOS/vm/OSX/sqMacUnixExternalPrims.m	2016-05-04 18:45:02 UTC (rev 3694)
+++ branches/Cog/platforms/iOS/vm/OSX/sqMacUnixExternalPrims.m	2016-05-05 16:24:39 UTC (rev 3695)
@@ -162,6 +162,7 @@
 		if (handle == null) {
 			char * why = dlerror();
 			dprintf((stderr, "ioLoadModule(<intrinsic>): %s\n", why));
+			return NULL;
 		} else {
 			dprintf((stderr, "loaded: <intrinsic>\n"));
 			return handle;
@@ -208,7 +209,8 @@
 			OSErr err = FSFindFolder(kSystemDomain, kFrameworksFolderType, false, &frameworksFolderRef);
 #pragma unused(err)
 			NSURL *myURLRef = (NSURL *) CFBridgingRelease(CFURLCreateFromFSRef(kCFAllocatorDefault, &frameworksFolderRef));
-			systemFolder = RETAINOBJ([myURLRef path]);
+			RETAINOBJ(myURLRef.path);
+			systemFolder = myURLRef.path;
 		}
 		
 		pluginNameLength = strlen(pluginName);

Modified: branches/Cog/platforms/iOS/vm/SqueakPureObjc_Prefix.pch
===================================================================
--- branches/Cog/platforms/iOS/vm/SqueakPureObjc_Prefix.pch	2016-05-04 18:45:02 UTC (rev 3694)
+++ branches/Cog/platforms/iOS/vm/SqueakPureObjc_Prefix.pch	2016-05-05 16:24:39 UTC (rev 3695)
@@ -8,7 +8,7 @@
 
 #if __has_feature(objc_arc)
 #define RELEASEOBJ(x)
-#define RETAINOBJ(x) x
+#define RETAINOBJ(x) 
 #define AUTORELEASEOBJ(x) x
 #define SUPERDEALLOC
 #else