The branch, master, has been updated. - Log -----------------------------------------------------------------
commit de6ff1fec2b918a0bd09f48b17a2770bfc15aef7 Author: Stephan Witt <[email protected]> Date: Sun Oct 14 14:30:47 2012 +0200 correct format for unsigned long argument, remoteCloseLink is oneway void diff --git a/src/support/linkback/LinkBack.m b/src/support/linkback/LinkBack.m index 26ba305..66febfa 100644 --- a/src/support/linkback/LinkBack.m +++ b/src/support/linkback/LinkBack.m @@ -71,7 +71,7 @@ NSString* LinkBackUniqueItemKey() NSString* base = [[NSBundle mainBundle] bundleIdentifier] ; unsigned long time = [NSDate timeIntervalSinceReferenceDate] ; - return [NSString stringWithFormat: @"%@%.8x.%.4x",base,time,counter++] ; + return [NSString stringWithFormat: @"%@%.8lx.%.4x",base,time,counter++] ; } BOOL LinkBackDataBelongsToActiveApplication(id data) @@ -313,7 +313,7 @@ NSMutableDictionary* keyedLinkBacks = nil ; } // this method is called whenever the link is about to be or has been closed by the other side. -- (void)remoteCloseLink +- (oneway void)remoteCloseLink { if (peer) { [peer release] ; commit 318f6b39b76ad622ec69e51443d03a0b341d9ffa Author: Stephan Witt <[email protected]> Date: Sun Oct 14 14:29:01 2012 +0200 add missing argument for log message diff --git a/src/support/linkback/LinkBackProxy.m b/src/support/linkback/LinkBackProxy.m index 9ead1e8..1e77d94 100644 --- a/src/support/linkback/LinkBackProxy.m +++ b/src/support/linkback/LinkBackProxy.m @@ -89,7 +89,7 @@ static NSAutoreleasePool * pool = nil; NSMutableDictionary * linkBackDataDict = [NSUnarchiver unarchiveObjectWithData:linkBackData]; if (linkBackDataDict == nil) { - NSLog(@"LinkBack data in %@ corrupted"); + NSLog(@"LinkBack data in %@ corrupted", fileName); return NO; } commit 652ed30e9235568979ea0f4cde1cc4ac0e4477dc Author: Stephan Witt <[email protected]> Date: Sun Oct 14 14:28:19 2012 +0200 correct unsigned integer compare operations diff --git a/src/support/linkback/LinkBackServer.m b/src/support/linkback/LinkBackServer.m index bd6f90e..b7f9394 100644 --- a/src/support/linkback/LinkBackServer.m +++ b/src/support/linkback/LinkBackServer.m @@ -83,8 +83,8 @@ BOOL LinkBackServerIsSupported(NSString* name, id supportedServers) if (supportedServers) { if ([supportedServers isKindOfClass: [NSArray class]]) { idx = [supportedServers count] ; - while((NO==ret) && (--idx >= 0)) { - curServer = [supportedServers objectAtIndex: idx] ; + while((NO==ret) && (idx > 0)) { + curServer = [supportedServers objectAtIndex: --idx] ; ret = [curServer isEqualToString: name] ; } } else ret = [curServer isEqualToString: name] ; @@ -119,8 +119,8 @@ NSString* FindLinkBackServer(NSString* bundleIdentifier, NSString* serverName, N // find all .app bundles in the directory and test them. idx = (contents) ? [contents count] : 0 ; - while((nil==ret) && (--idx >= 0)) { - cpath = [contents objectAtIndex: idx] ; + while((nil==ret) && (idx > 0)) { + cpath = [contents objectAtIndex: --idx] ; if ([[cpath pathExtension] isEqualToString: @"app"]) { cpath = [dir stringByAppendingPathComponent: cpath] ; @@ -137,10 +137,10 @@ NSString* FindLinkBackServer(NSString* bundleIdentifier, NSString* serverName, N // if the app was not found, descend into non-app dirs. only descend 4 levels to avoid taking forever. if ((nil==ret) && (level<4)) { idx = (contents) ? [contents count] : 0 ; - while((nil==ret) && (--idx >= 0)) { + while((nil==ret) && (idx > 0)) { BOOL isdir ; - cpath = [contents objectAtIndex: idx] ; + cpath = [contents objectAtIndex: --idx] ; [fm fileExistsAtPath: cpath isDirectory: &isdir] ; if (isdir && (![[cpath pathExtension] isEqualToString: @"app"])) { cpath = [dir stringByAppendingPathComponent: cpath] ; ----------------------------------------------------------------------- Summary of changes: src/support/linkback/LinkBack.m | 4 ++-- src/support/linkback/LinkBackProxy.m | 2 +- src/support/linkback/LinkBackServer.m | 12 ++++++------ 3 files changed, 9 insertions(+), 9 deletions(-) hooks/post-receive -- The LyX Source Repository
