darlinghq/darling-dbuskit
1
0
Fork 0
mirror of https://github.com/darlinghq/darling-dbuskit.git synced 2024-12-02 17:26:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

* Source/DKProxy.m: Rename -_methodForSelector:block: to

Browse Source 
-_methodForSelector:waitForCache:.
* Source/DKArgument.m: Add cast that might be needed.


git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/dbuskit/trunk@31051 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Niels Grewe 2010-07-29 15:24:35 +00:00
parent d381048421
commit e438cd6517
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/DKArgument.m
View File

@ -680,7 +680,7 @@ DKDBusTypeForUnboxingObject(id object)
*/ */
if ([rootProxy hasSameScopeAs: value]) if ([rootProxy hasSameScopeAs: value])
{ {
*buffer = (uintptr_t)[[value _path] UTF8String]; *buffer = (uintptr_t)(void*)[[value _path] UTF8String];
return YES; return YES;
} }
} }

22
Source/DKProxy.m
View File

@ -64,7 +64,7 @@ enum
- (void)_setupTables; - (void)_setupTables;
- (DKMethod*)_methodForSelector: (SEL)aSelector - (DKMethod*)_methodForSelector: (SEL)aSelector
block: (BOOL)doBlock; waitForCache: (BOOL)doWait;
- (void)_buildMethodCache; - (void)_buildMethodCache;
- (void)_installIntrospectionMethod; - (void)_installIntrospectionMethod;
- (void)_installMethod: (DKMethod*)aMethod - (void)_installMethod: (DKMethod*)aMethod
@ -308,7 +308,7 @@ DKInterface *_DKInterfaceIntrospectable;
* the signature from the associated method. * the signature from the associated method.
*/ */
DKMethod *method = [self _methodForSelector: aSelector DKMethod *method = [self _methodForSelector: aSelector
block: NO]; waitForCache: NO];
const char *types = NULL; const char *types = NULL;
NSMethodSignature *theSig = nil; NSMethodSignature *theSig = nil;
# if HAVE_TYPED_SELECTORS == 0 # if HAVE_TYPED_SELECTORS == 0
@ -328,7 +328,7 @@ DKInterface *_DKInterfaceIntrospectable;
if (nil == method) if (nil == method)
{ {
method = [self _methodForSelector: sel_getUid(sel_getName(aSelector)) method = [self _methodForSelector: sel_getUid(sel_getName(aSelector))
block: NO]; waitForCache: NO];
} }
/* /*
@ -355,7 +355,7 @@ DKInterface *_DKInterfaceIntrospectable;
{ {
// No interface, so we try the standard dispatch table: // No interface, so we try the standard dispatch table:
method = [self _methodForSelector: unmangledSel method = [self _methodForSelector: unmangledSel
block: NO]; waitForCache: NO];
} }
} }
@ -385,7 +385,7 @@ DKInterface *_DKInterfaceIntrospectable;
} }
- (DKMethod*) _methodForSelector: (SEL)aSel - (DKMethod*) _methodForSelector: (SEL)aSel
block: (BOOL)doBlock waitForCache: (BOOL)doWait
{ {
DKMethod *m = nil; DKMethod *m = nil;
BOOL isIntrospect = [@"Introspect" isEqualToString: NSStringFromSelector(aSel)]; BOOL isIntrospect = [@"Introspect" isEqualToString: NSStringFromSelector(aSel)];
@ -397,15 +397,15 @@ DKInterface *_DKInterfaceIntrospectable;
} }
if (nil == m) if (nil == m)
{ {
if (isIntrospect || (NO == doBlock)) if (isIntrospect || (NO == doWait))
{ {
// For the introspection selector, just lock the table because the // For the introspection selector, just lock the table because the
// introspection selector has been installed on init time. Also, when // introspection selector has been installed on init time. Also, when
// doBlock == NO, we won't wait for the correct state but simply lock the // doWait == NO, we won't wait for the correct state but simply lock the
// table. // table.
[tableLock lock]; [tableLock lock];
} }
else if (doBlock) else if (doWait)
{ {
// Else, we need to wait for the correct state to be signaled by the // Else, we need to wait for the correct state to be signaled by the
@ -425,7 +425,7 @@ DKInterface *_DKInterfaceIntrospectable;
// Retry, but this time, block until the introspection data is resolved. // Retry, but this time, block until the introspection data is resolved.
m = [self _methodForSelector: aSel m = [self _methodForSelector: aSel
block: YES]; waitForCache: YES];
} }
return m; return m;
} }
@ -437,7 +437,7 @@ DKInterface *_DKInterfaceIntrospectable;
NSMethodSignature *signature = [inv methodSignature]; NSMethodSignature *signature = [inv methodSignature];
NSString *interface = nil; NSString *interface = nil;
DKMethod *method = [self _methodForSelector: selector DKMethod *method = [self _methodForSelector: selector
block: YES]; waitForCache: YES];
DKMethodCall *call = nil; DKMethodCall *call = nil;
if (nil == method) if (nil == method)
@ -455,7 +455,7 @@ DKInterface *_DKInterfaceIntrospectable;
else else
{ {
method = [self _methodForSelector: newSel method = [self _methodForSelector: newSel
block: YES]; waitForCache: YES];
} }
} }
} }