Revision: 3135
          http://skim-app.svn.sourceforge.net/skim-app/?rev=3135&view=rev
Author:   hofman
Date:     2007-11-02 12:28:42 -0700 (Fri, 02 Nov 2007)

Log Message:
-----------
Fix compiler warnings.

Modified Paths:
--------------
    trunk/SKDocument.m

Modified: trunk/SKDocument.m
===================================================================
--- trunk/SKDocument.m  2007-11-02 19:24:48 UTC (rev 3134)
+++ trunk/SKDocument.m  2007-11-02 19:28:42 UTC (rev 3135)
@@ -1541,11 +1541,11 @@
 
 #pragma mark Passwords
 
-- (void)savePasswordInKeychain:(NSString *)password {
+- (void)savePasswordInKeychain:(NSString *)aPassword {
     if ([[self pdfDocument] isLocked])
         return;
     
-    [self setPassword:password];
+    [self setPassword:aPassword];
     
     int saveOption = [[NSUserDefaults standardUserDefaults] 
integerForKey:SKSavePasswordOptionKey];
     if (saveOption != NSAlertAlternateReturn) {
@@ -1577,7 +1577,7 @@
                     SecKeychainItemFreeContent(NULL, (void *)passwordData);
                     passwordData = NULL;
                     
-                    passwordData = [password UTF8String];
+                    passwordData = [aPassword UTF8String];
                     SecKeychainAttribute attrs[] = {
                         { kSecAccountItemAttr, strlen(userNameCString), (char 
*)userNameCString },
                         { kSecServiceItemAttr, strlen(nameCString), (char 
*)nameCString } };
@@ -1606,14 +1606,14 @@
             void *passwordData = NULL;
             UInt32 passwordLength = 0;
             NSData *data = nil;
-            NSString *password = nil;
+            NSString *aPassword = nil;
             OSErr err = SecKeychainFindGenericPassword(NULL, 
strlen(serviceName), serviceName, strlen(userName), userName, &passwordLength, 
&passwordData, NULL);
             if (err == noErr) {
                 data = [NSData dataWithBytes:passwordData 
length:passwordLength];
                 SecKeychainItemFreeContent(NULL, passwordData);
-                password = [[[NSString alloc] initWithData:data 
encoding:NSUTF8StringEncoding] autorelease];
-                if ([document unlockWithPassword:password])
-                    [self setPassword:password];
+                aPassword = [[[NSString alloc] initWithData:data 
encoding:NSUTF8StringEncoding] autorelease];
+                if ([document unlockWithPassword:aPassword])
+                    [self setPassword:aPassword];
             }
         }
     }


This was sent by the SourceForge.net collaborative development platform, the 
world's largest Open Source development site.

-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems?  Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
Skim-app-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/skim-app-commit

Reply via email to