MemberAccess is allowed Word, not just Identifier.

[cycript.git] / Trampoline.t.cpp

diff --git a/Trampoline.t.cpp b/Trampoline.t.cpp
index 1d7cf95d21338857c28e30e7f11479803e67cdf2..f8780bc126f2b79882670e7ddffd3bbbc0fa5462 100644 (file)
--- a/Trampoline.t.cpp
+++ b/Trampoline.t.cpp
@@ -32,6 +32,8 @@ static _finline void dlset(Baton *baton, Type_ &function, const char *name, void
         baton->dlerror();
 }
 
         baton->dlerror();
 }
 

+// XXX: where you find this needs to be relative to CoreFoundation (or something)
+// XXX: this needs to check if the framework is under PrivateFrameworks instead

 #define Framework(framework) \
     "/System/Library/Frameworks/" #framework ".framework/" #framework
 
 #define Framework(framework) \
     "/System/Library/Frameworks/" #framework ".framework/" #framework
 


@@ -66,10 +68,12 @@ void *Routine(void *arg) {
 
     void (*CYHandleServer)(pid_t);
     dlset(baton, CYHandleServer, "CYHandleServer", handle);
 
     void (*CYHandleServer)(pid_t);
     dlset(baton, CYHandleServer, "CYHandleServer", handle);

+    if (CYHandleServer == NULL) {
+        baton->dlerror();
+        return NULL;
+    }

 
 

-    if (CYHandleServer != NULL)
-        CYHandleServer(baton->pid);
-
+    CYHandleServer(baton->pid);

     return NULL;
 }
 
     return NULL;
 }