Changeset 76

Timestamp:

12/27/05 14:44:09 (3 years ago)

Author:

mrowe

Message:

Replace uses of -[NSString cString] + strstr/strcmp with their NSString equivalents. Closes #37.

Files:

• trunk/AgentController.m (modified) (1 diff)
• trunk/Libs/SSHAgent.m (modified) (2 diffs)
• trunk/UpdateController.m (modified) (1 diff)

trunk/AgentController.m

@@ -709 +709 @@
-                        theOutput = [[[NSString alloc] initWithData:[[thePipe fileHandleForReading] readDataToEndOfFile] encoding:NSASCIIStringEncoding] autorelease];
-        
-(strstr([theOutput cString], "ScreenSaverEngine.app") != nil
+ ([theOutput rangeOfString:@"ScreenSaverEngine.app"].location != NSNotFound
-                        {
-                                if((([[NSUserDefaults standardUserDefaults] integerForKey:OnScreensaverString] == 2)

trunk/Libs/SSHAgent.m

@@ -183 +183 @@
-                /* Split the line with delimiter " ". */
-                columns = [[lines objectAtIndex:i] componentsSeparatedByString:@" "];
+                if ([columns count] != 3)
+                        continue;
-
-                /* If 2nd column matches "SSH_AUTH_SOCK", then 3rd column is the socket path. */
-(([columns count] == 3) && (strcmp([[columns objectAtIndex:1] cString], "SSH_AUTH_SOCK") == 0)
+ ([@"SSH_AUTH_SOCK" isEqualToString:[columns objectAtIndex:1]]
-                {
-                        [agentSocketPathLock lock];
@@ -193 +195 @@
-
-                /* If 2nd column matches "SSH_AGENT_PID", then 3rd column is the PID. */
-(([columns count] == 3) && (strcmp([[columns objectAtIndex:1] cString], "SSH_AGENT_PID") == 0)
+ ([@"SSH_AGENT_PID" isEqualToString:[columns objectAtIndex:1]]
-                {
-                        [thePidLock lock];

trunk/UpdateController.m

@@ -89 +89 @@
-        }
-
-(strcmp([latestVersion cString], [currentVersion cString]) > 0
+ ([latestVersion compare:currentVersion] == NSOrderedDescending
-        {
-                if((downloadURL) && (changesURL))