From ff138d1bdeab24de27790474adf24ea124a211f1 Mon Sep 17 00:00:00 2001 From: Claudio Bisegni Date: Wed, 12 Aug 2009 21:19:49 +0200 Subject: [PATCH] OSX Preference Pane and AFS Backgrounder Cleaned most unused log Reviewed-on: http://gerrit.openafs.org/308 Reviewed-by: Derrick Brashear Tested-by: Derrick Brashear --- .../AFSBackgrounder/AFSBackgrounderDelegate.m | 22 ++----------- .../AFSMenuCredentialContoller.m | 8 ----- .../AFSBackgrounder/AFSMenuExtra.m | 25 ++------------- .../CredentialWindowController.m | 2 -- .../DARWIN/AFSPreference/AFSCommanderPref.m | 21 ------------ .../DARWIN/AFSPreference/AFSPropertyManager.m | 32 ++++--------------- .../DARWIN/AFSPreference/InfoController.m | 1 - .../AFSPreference/IpConfiguratorCommander.m | 9 ------ src/platform/DARWIN/AFSPreference/TaskUtil.m | 7 ---- .../AFSPreference/TokenCredentialController.m | 1 - 10 files changed, 11 insertions(+), 117 deletions(-) diff --git a/src/platform/DARWIN/AFSPreference/AFSBackgrounder/AFSBackgrounderDelegate.m b/src/platform/DARWIN/AFSPreference/AFSBackgrounder/AFSBackgrounderDelegate.m index ba58532cb..9c1152dcf 100644 --- a/src/platform/DARWIN/AFSPreference/AFSBackgrounder/AFSBackgrounderDelegate.m +++ b/src/platform/DARWIN/AFSPreference/AFSBackgrounder/AFSBackgrounderDelegate.m @@ -24,7 +24,6 @@ @implementation AFSBackgrounderDelegate #pragma mark NSApp Delegate - (void)applicationDidFinishLaunching:(NSNotification *)aNotification { - NSLog(@"Init the afs manager"); afsMngr = [[AFSPropertyManager alloc] initWithAfsPath:afsSysPath]; // allocate the lock for concurent afs check state tokensLock = [[NSLock alloc] init]; @@ -112,7 +111,6 @@ // ------------------------------------------------------------------------------- - (void) readPreferenceFile:(NSNotification *)notification { - NSLog(@"Reading preference file"); if(afsSysPath) { [afsSysPath release]; afsSysPath = nil; @@ -145,9 +143,7 @@ // ------------------------------------------------------------------------------- /**/ - (void)chageMenuVisibility:(NSNotification *)notification { - NSLog(@"chageMenuVisibility"); [self readPreferenceFile:nil]; - NSLog(@"showStatusMenu: %d", [showStatusMenu intValue]); [self setStatusItem:[showStatusMenu boolValue]]; } @@ -156,7 +152,6 @@ // ------------------------------------------------------------------------------- - (void)startStopAfs:(id)sender { - NSLog(@"startStopAfs: %s",[afsSysPath UTF8String]); if(!afsSysPath) return; OSStatus status = noErr; @@ -168,9 +163,7 @@ if(afsdPath == nil) return; currentAfsState = [afsMngr checkAfsStatus]; rootHelperApp = [[NSBundle mainBundle] pathForResource:@"afshlp" ofType:@""]; - - //[startStopScript setString: resourcePath]; - //NSLog(@"LAunch repair HelperTool"); + //Check helper app [self repairHelperTool]; @@ -179,18 +172,15 @@ if(status == noErr){ if(currentAfsState){ //shutdown afs - //NSLog(@"Shutting down afs"); NSMutableString *afsKextPath = [[NSMutableString alloc] initWithCapacity:256]; [afsKextPath setString:afsSysPath]; [afsKextPath appendString:@"/etc/afs.kext"]; - //NSLog(@"executeTaskWithAuth"); const char *stopAfsArgs[] = {"stop_afs", [afsKextPath UTF8String], [afsdPath UTF8String], 0L}; [[AuthUtil shared] execUnixCommand:[rootHelperApp UTF8String] args:stopAfsArgs output:nil]; } else { - //NSLog(@"Starting up afs"); const char *startAfsArgs[] = {[[ [NSBundle mainBundle] pathForResource:@"start_afs" ofType:@"sh"] UTF8String], [afsSysPath UTF8String], [afsdPath UTF8String], 0L}; [[AuthUtil shared] execUnixCommand:[rootHelperApp UTF8String] args:startAfsArgs @@ -222,15 +212,12 @@ AFSPropertyManager *afsPropMngr = [[AFSPropertyManager alloc] initWithAfsPath:afsSysPath ]; [afsPropMngr loadConfiguration]; - if([useAklogPrefValue boolValue]) { - NSLog(@"Use Aklog"); [afsPropMngr getTokens:false usr:nil pwd:nil]; [self klogUserEven:nil]; } else { - NSLog(@"Use Klog"); // register for user event [[NSDistributedNotificationCenter defaultCenter] addObserver:self selector:@selector(klogUserEven:) @@ -364,8 +351,7 @@ { struct stat st; int fdTool; - int status = 0; - NSLog(@"repairHelperTool"); + int status = 0; NSString *afshlpPath = [[NSBundle mainBundle] pathForResource:@"afshlp" ofType:nil]; @@ -400,11 +386,7 @@ [[AuthUtil shared] deautorize]; } } else NSLog(@"st_uid = 0"); - - - close(fdTool); - NSLog(@"Self-repair done."); } diff --git a/src/platform/DARWIN/AFSPreference/AFSBackgrounder/AFSMenuCredentialContoller.m b/src/platform/DARWIN/AFSPreference/AFSBackgrounder/AFSMenuCredentialContoller.m index 5775246f5..c693ab57d 100644 --- a/src/platform/DARWIN/AFSPreference/AFSBackgrounder/AFSMenuCredentialContoller.m +++ b/src/platform/DARWIN/AFSPreference/AFSBackgrounder/AFSMenuCredentialContoller.m @@ -18,12 +18,10 @@ viewRect = rect; credentialWindow = nil; afsPropMngr = [afsPropManager retain]; - NSLog(@"init AFSMenuCredentialContoller"); return [self init]; } - (void)dealloc { - NSLog(@"dealloc AFSMenuCredentialContoller"); if(credentialWindow) [credentialWindow release]; [super dealloc]; @@ -33,27 +31,21 @@ { // calculate the point where show the window NSPoint topLeft = {viewRect.origin.x-160,[[NSScreen mainScreen] frame].size.height-kMenuBarHeight}; - NSLog(@"viewRect.origin.x=%d, topLeft.x=%d", viewRect.origin.x, topLeft.x); // load the bundle for [NSBundle loadNibNamed:@"CredentialWindow.nib" owner:self]; - NSLog(@"prepare to open window CredentialWindow"); credentialWindow = [[NSWindow alloc] initWithContentRect:[((NSView*) credentialView) frame] styleMask:NSTitledWindowMask /*| NSUtilityWindowMask*/ backing:NSBackingStoreBuffered defer:YES screen:[NSScreen mainScreen]]; - NSLog(@"Finestra"); [credentialWindow setTitle:@"Klog"]; [credentialWindow setFrameTopLeftPoint:topLeft]; [credentialWindow setContentView:credentialView]; [credentialWindow makeKeyAndOrderFront:self]; - NSLog(@"creata"); - } -(void) closeWindow { - NSLog(@"closeWindow"); if([(CredentialWindowController*)credWinController takenToken] && afsPropMngr) { [afsPropMngr getTokens:true usr:[(CredentialWindowController*)credWinController uName] diff --git a/src/platform/DARWIN/AFSPreference/AFSBackgrounder/AFSMenuExtra.m b/src/platform/DARWIN/AFSPreference/AFSBackgrounder/AFSMenuExtra.m index 76f079c50..cf5c4d814 100644 --- a/src/platform/DARWIN/AFSPreference/AFSBackgrounder/AFSMenuExtra.m +++ b/src/platform/DARWIN/AFSPreference/AFSBackgrounder/AFSMenuExtra.m @@ -162,20 +162,13 @@ afsSysPath = nil; } - afsSysPath = PREFERENCE_AFS_SYS_PAT_STATIC;/*(NSString*)CFPreferencesCopyValue((CFStringRef)PREFERENCE_AFS_SYS_PAT, - (CFStringRef)afsCommanderID, - kCFPreferencesAnyUser, - kCFPreferencesAnyHost);*/ - //NSLog(@"Path readed %s", (afsSysPath==nil?[afsSysPath UTF8String]:@" no path found ")); + afsSysPath = PREFERENCE_AFS_SYS_PAT_STATIC; // read the preference for aklog use useAklogPrefValue = (NSNumber*)CFPreferencesCopyValue((CFStringRef)PREFERENCE_USE_AKLOG, (CFStringRef)afsCommanderID, kCFPreferencesCurrentUser, kCFPreferencesAnyHost); - //set the menu name - //NSLog(@"Preference readed for useAklogPrefValue %d", [useAklogPrefValue intValue]); - [self updateAfsStatus:nil]; } @@ -184,7 +177,6 @@ // ------------------------------------------------------------------------------- - (void)startStopAfs:(id)sender { - NSLog(@"startStopAfs: %s",[afsSysPath UTF8String]); if(!afsSysPath) return; OSStatus status = noErr; @@ -199,31 +191,24 @@ [afsMngr release]; rootHelperApp = [[self bundle] pathForResource:@"afshlp" ofType:@""]; - - //[startStopScript setString: resourcePath]; - //NSLog(@"LAunch repair HelperTool"); + //Check helper app [self repairHelperTool]; // make the parameter to call the root helper app - //NSLog(@"Path installazione afs: %s",[afsSysPath UTF8String]); - //NSLog(@"Path installazione afsd: %s", [afsdPath UTF8String]); status = [[AuthUtil shared] autorize]; if(status == noErr){ if(currentAfsState){ //shutdown afs - //NSLog(@"Shutting down afs"); NSMutableString *afsKextPath = [[NSMutableString alloc] initWithCapacity:256]; [afsKextPath setString:afsSysPath]; [afsKextPath appendString:@"/etc/afs.kext"]; - //NSLog(@"executeTaskWithAuth"); const char *stopAfsArgs[] = {"stop_afs", [afsKextPath UTF8String], [afsdPath UTF8String], 0L}; [[AuthUtil shared] execUnixCommand:[rootHelperApp UTF8String] args:stopAfsArgs output:nil]; } else { - //NSLog(@"Starting up afs"); const char *startAfsArgs[] = {[[[self bundle] pathForResource:@"start_afs" ofType:@"sh"] UTF8String], [afsSysPath UTF8String], [afsdPath UTF8String], 0L}; [[AuthUtil shared] execUnixCommand:[rootHelperApp UTF8String] args:startAfsArgs @@ -257,13 +242,11 @@ if([useAklogPrefValue intValue]==NSOnState ) { - NSLog(@"Use Aklog"); [afsPropMngr getTokens:false usr:nil pwd:nil]; [self klogUserEven:nil]; } else { - NSLog(@"Use Klog"); // register for user event [[NSDistributedNotificationCenter defaultCenter] addObserver:self selector:@selector(klogUserEven:) @@ -389,8 +372,7 @@ { struct stat st; int fdTool; - int status = 0; - NSLog(@"repairHelperTool"); + int status = 0; NSString *afshlpPath = [[self bundle] pathForResource:@"afshlp" ofType:nil]; @@ -429,7 +411,6 @@ close(fdTool); - NSLog(@"Self-repair done."); }@end diff --git a/src/platform/DARWIN/AFSPreference/AFSBackgrounder/CredentialWindow/CredentialWindowController.m b/src/platform/DARWIN/AFSPreference/AFSBackgrounder/CredentialWindow/CredentialWindowController.m index 131bcb744..45f03ede3 100644 --- a/src/platform/DARWIN/AFSPreference/AFSBackgrounder/CredentialWindow/CredentialWindowController.m +++ b/src/platform/DARWIN/AFSPreference/AFSBackgrounder/CredentialWindow/CredentialWindowController.m @@ -15,7 +15,6 @@ // ------------------------------------------------------------------------------- - (void)awakeFromNib { - NSLog(@"awakeFromNib"); } // ------------------------------------------------------------------------------- @@ -39,7 +38,6 @@ - (IBAction) closePanel:(id) sender { taken = NO; - NSLog(@"closePanel"); [[NSDistributedNotificationCenter defaultCenter] postNotificationName:kAFSMenuExtraID object:kLogWindowClosed]; } diff --git a/src/platform/DARWIN/AFSPreference/AFSCommanderPref.m b/src/platform/DARWIN/AFSPreference/AFSCommanderPref.m index 90389bb81..963d7ef86 100644 --- a/src/platform/DARWIN/AFSPreference/AFSCommanderPref.m +++ b/src/platform/DARWIN/AFSPreference/AFSCommanderPref.m @@ -173,7 +173,6 @@ [alert close]; switch (returnCode) { case 1: - NSLog(@"Yes"); if([[NSFileManager defaultManager] createDirectoryAtPath:[HOME_LAUNCHD_AGENT_FOLDER stringByExpandingTildeInPath] attributes:nil]) { @@ -186,8 +185,6 @@ } break; case 0: - NSLog(@"No"); - break; } } @@ -198,7 +195,6 @@ // ------------------------------------------------------------------------------- - (void)willUnselect { - NSLog(@"willUnselect"); // remove self as datasource [((NSTableView*)cellList) setDataSource:nil]; [((NSTableView*)tokensTable) setDataSource:nil]; @@ -360,11 +356,9 @@ - (IBAction) saveCacheManagerParam:(id) sender { @try{ - NSLog(@"Backing up the cache configuration file"); //Update the value form view to afs property manager class [self updateCacheParamFromView]; [afsProperty saveCacheConfigurationFiles:YES]; - NSLog(@"Cache configuration file backuped"); [self showMessage:kSavedCacheConfiguration]; }@catch(NSException *e){ [self showMessage:[e reason]]; @@ -378,9 +372,7 @@ // ------------------------------------------------------------------------------- - (IBAction) refreshConfiguration:(id) sender { - NSLog(@"refreshConfiguration"); NSString *afsBasePath = PREFERENCE_AFS_SYS_PAT_STATIC; - @try{ // set the afs path [afsProperty setPath:afsBasePath]; @@ -660,8 +652,6 @@ // ------------------------------------------------------------------------------- - (IBAction) info:(id) sender { - //NSLog(kDevelopInfo); - //[self showMessage:kDevelopInfo]; [((InfoController*) infoController) showHtmlResource:[[self bundle] pathForResource:@"licenza" ofType:@"rtf"]]; [NSApp beginSheet: infoSheet @@ -874,11 +864,9 @@ // check if the element can be get if(doFilter) { //Get the CellServDB array enumerator - //NSLog(@"String for filtering: %s", [textToFilter UTF8String]); NSRange rsltRng = [[[cellElement getCellName] lowercaseString] rangeOfString:textToFilter]; if(rsltRng.location != NSNotFound) { //we can add this cell to filtered - //NSLog(@"Element found during filter: %s", [[cellElement getCellName] UTF8String]); [filteredCellDB addObject:[cellElement retain]]; } } else { @@ -935,7 +923,6 @@ -(void) setAfsStatus { BOOL afsIsUp = [afsProperty checkAfsStatus]; - NSLog(@"Afs is: %s", afsIsUp?"Up":"Down"); [((NSButton *)startStopButton) setTitle: (afsIsUp?kAfsButtonShutdown:kAfsButtonStartup)]; NSMutableAttributedString *colorTitle =[[NSMutableAttributedString alloc] initWithAttributedString:[((NSButton *)startStopButton) attributedTitle]]; @@ -1018,9 +1005,6 @@ //check to see if the cache param tab is the tab that will be selected if([((NSString*)[tabViewItem identifier]) intValue] == TAB_LINK) { - - // [groupsBox setHidden:YES]; - NSLog([tabViewItem label]); [ViewUtility enbleDisableControlView:[tabViewItem view] controlState:NO]; } @@ -1186,12 +1170,10 @@ // ------------------------------------------------------------------------------- - (void)didEndSheet:(NSWindow *)sheet returnCode:(int)returnCode contextInfo:(void *)contextInfo { - NSLog(@"didEndSheet"); [sheet orderOut:self]; //Filter the cellServDb and allocate filtered array [self searchCellTextEvent:nil]; [((NSTableView*)cellList) reloadData]; - NSLog(@"Has saved %s:", ([((IpConfiguratorCommander*) ipConfControllerCommander) saved])?"YES":"NO"); } // ------------------------------------------------------------------------------- @@ -1199,7 +1181,6 @@ // ------------------------------------------------------------------------------- - (void)didEndCredentialSheet:(NSWindow *)sheet returnCode:(int)returnCode contextInfo:(void *)contextInfo { - NSLog(@"didEndCredentialSheet"); if([((TokenCredentialController*)credentialCommander) takenToken] == YES){ /*[AFSPropertyManager klog:[((TokenCredentialController*)credentialCommander) uName] uPwd:[((TokenCredentialController*)credentialCommander) uPwd] ];*/ @@ -1219,7 +1200,6 @@ // ------------------------------------------------------------------------------- - (void)didEndInfoSheet:(NSWindow *)sheet returnCode:(int)returnCode contextInfo:(void *)contextInfo { - NSLog(@"didEndInfoSheet"); [sheet orderOut:self]; } @@ -1228,7 +1208,6 @@ // ------------------------------------------------------------------------------- - (void)didEndSymlinkSheet:(NSWindow *)sheet returnCode:(int)returnCode contextInfo:(void *)contextInfo { - NSLog(@"didEndSymlinkSheet"); [lyncCreationSheet orderOut:self]; } @end diff --git a/src/platform/DARWIN/AFSPreference/AFSPropertyManager.m b/src/platform/DARWIN/AFSPreference/AFSPropertyManager.m index 21e53d5cc..b82226e46 100644 --- a/src/platform/DARWIN/AFSPreference/AFSPropertyManager.m +++ b/src/platform/DARWIN/AFSPreference/AFSPropertyManager.m @@ -88,9 +88,9 @@ // ------------------------------------------------------------------------------- -(void) dealloc { - if(installationPath){ [installationPath release]; NSLog(@"Released installationPath"); } - if(cellList) { NSLog(@"Released cellList");[cellList removeAllObjects];[cellList release];} - if(cellName) { NSLog(@"Released cellName");[cellName release];} + if(installationPath){ [installationPath release];} + if(cellList) {[cellList removeAllObjects];[cellList release];} + if(cellName) {[cellName release];} if(futil) { [futil endAutorization]; [futil release]; @@ -311,41 +311,32 @@ // read thiscell config file [filePath setString:installationPath]; [filePath appendString: @"/etc/ThisCell"]; - NSLog(@"Search for cell name."); + [self readCellInfo:filePath]; if(!cellName){ @throw [NSException exceptionWithName:@"readCellInfo" reason:kThisCellFOError userInfo:nil]; } - NSLog(@"Cell found: %@", cellName); - //read TheseCell file [filePath setString: installationPath]; [filePath appendString: @"/etc/TheseCells"]; userDefaultCellArray = [self readTheseCell:filePath]; //read cell serv db - NSLog(@"Scan for cell db"); [filePath setString: installationPath]; [filePath appendString: @"/etc/CellServDB"]; [self readCellDB:filePath]; - NSLog(@"Server found: %d", [cellList count]); - - //Read cacheinfo - NSLog(@"Scan cacheinfo file"); [filePath setString: installationPath]; [filePath appendString: @"/etc/cacheinfo"]; [self readCacheInfo:filePath]; - NSLog(@"End scan cacheinfo file"); //Read config/afsd.options [filePath setString: installationPath]; [filePath appendString: useAfsdConfVersion?AFSD_NEW_PREFERENCE_FILE:AFSD_OLD_PREFERENCE_FILE]; [self readAfsdOption:filePath]; - } @catch(NSException * e){ @throw e; } @finally { @@ -490,8 +481,6 @@ do{ [afsdOptionS scanUpToCharactersFromSet:space intoString:&tmpString]; if(!tmpString) continue; - - NSLog(tmpString); //check parameter type if([tmpString isEqualToString:@AFSD_OPTION_DAEMONS_KEY]) { @@ -569,8 +558,8 @@ //scann the line - [lineScanner scanUpToString:@"\"" intoString:¶mValue]; NSLog(paramValue);[lineScanner scanUpToString:@"-" intoString:¶mValue]; - [lineScanner scanUpToString:@"\"" intoString:¶mValue]; NSLog(paramValue); + [lineScanner scanUpToString:@"\"" intoString:¶mValue];[lineScanner scanUpToString:@"-" intoString:¶mValue]; + [lineScanner scanUpToString:@"\"" intoString:¶mValue]; // read the asfd option param line [self readAFSDParamLineContent:paramValue]; @@ -671,11 +660,7 @@ { NSString *tmpString = nil; NSString *result = [TaskUtil executeTaskSearchingPath:@"fs" args:[NSArray arrayWithObjects:@"-version", nil]]; - if(result) NSLog(@"fs -version return: %@", result); - - NSCharacterSet *endVersionCS = [NSCharacterSet characterSetWithCharactersInString:@"qwertyuiopasdfghjklzxcvbnmMNBVCXZLKJHGFDSAPOIUYTREWQ"]; - NSCharacterSet *spaceCS = [NSCharacterSet characterSetWithCharactersInString:@" "]; NSScanner *versionS = [NSScanner scannerWithString:result]; //go to start of version @@ -828,11 +813,8 @@ // readCellInfo: // ------------------------------------------------------------------------------- -(void) readCellInfo:(NSString*) configFile { - - NSError *error = nil; NSString *tmpStr = nil; - NSLog(@"Try to opening file: %@",configFile); NSString * result = [NSString stringWithContentsOfFile:configFile encoding:NSASCIIStringEncoding error:&error]; @@ -843,7 +825,6 @@ userInfo:nil]; } NSScanner *scanner = [NSScanner scannerWithString:result]; - [scanner scanUpToString:@"\n" intoString:&tmpStr]; @@ -988,7 +969,6 @@ if(line >= 2){ - NSLog(@"Token found %s", [tokenLine UTF8String]); // add enteir row to result [tokenList addObject:tokenLine]; // create the line scanner for all the row that contains token info diff --git a/src/platform/DARWIN/AFSPreference/InfoController.m b/src/platform/DARWIN/AFSPreference/InfoController.m index f10f03e8c..7ac33d14b 100644 --- a/src/platform/DARWIN/AFSPreference/InfoController.m +++ b/src/platform/DARWIN/AFSPreference/InfoController.m @@ -15,7 +15,6 @@ // ------------------------------------------------------------------------------- - (void)awakeFromNib { - NSLog(@"awakeFromNib"); htmlLicence = nil; } diff --git a/src/platform/DARWIN/AFSPreference/IpConfiguratorCommander.m b/src/platform/DARWIN/AFSPreference/IpConfiguratorCommander.m index 8ff39851e..30423976f 100644 --- a/src/platform/DARWIN/AFSPreference/IpConfiguratorCommander.m +++ b/src/platform/DARWIN/AFSPreference/IpConfiguratorCommander.m @@ -16,7 +16,6 @@ // ------------------------------------------------------------------------------- - (void)awakeFromNib { - NSLog(@"awakeFromNib"); [((NSTableView*)tableViewCellIP) setDelegate:self]; [((NSTableView*)tableViewCellIP) setDataSource:self]; } @@ -47,16 +46,9 @@ //store the cell name [cellElement setCellName:[((NSControl*) textFieldCellName) stringValue]]; [cellElement setCellComment:[((NSControl*) textFieldComment) stringValue]]; - - NSLog(@"Deleting:\n%@",[bkIPArray description]); [bkIPArray removeAllObjects]; - NSLog(@"deleted:\n"); - NSLog(@"Coping:\n%@",[workIPArray description]); [bkIPArray setArray:workIPArray]; - NSLog(@"Copied:\n%@",[workIPArray description]); - NSLog(@"Releasing:\n%@",[workIPArray description]); [workIPArray release]; - NSLog(@"Released:\n%@",[workIPArray description]); } // ------------------------------------------------------------------------------- @@ -201,7 +193,6 @@ - (void)tableView:(NSTableView *)aTable setObjectValue:(id)aData forTableColumn:(NSTableColumn *)aCol row:(int)aRow { - NSLog([aData description]); CellIp *ipElement = (CellIp*)[workIPArray objectAtIndex:aRow]; switch([((NSNumber*)[aCol identifier]) intValue]) { diff --git a/src/platform/DARWIN/AFSPreference/TaskUtil.m b/src/platform/DARWIN/AFSPreference/TaskUtil.m index e325accac..c27ee8f5e 100644 --- a/src/platform/DARWIN/AFSPreference/TaskUtil.m +++ b/src/platform/DARWIN/AFSPreference/TaskUtil.m @@ -38,7 +38,6 @@ // executeTask: // ------------------------------------------------------------------------------- +(NSString*) executeTask:(NSString*) taskName arguments:(NSArray *)args{ - NSLog(taskName); NSString *result = nil; int status = 0; NSFileHandle *file = nil; @@ -56,7 +55,6 @@ [taskToRun waitUntilExit]; status = [taskToRun terminationStatus]; if (status == 0){ - NSLog(@"Task succeeded."); NSData *data = [file readDataToEndOfFile]; // remove the \n character from unix command if([data length] > 0){ @@ -66,7 +64,6 @@ [taskToRun release]; result = [[NSString alloc] initWithData: realData encoding: NSUTF8StringEncoding]; - NSLog(result); } } else { NSLog(@"Task failed."); @@ -79,7 +76,6 @@ // executeTask: // ------------------------------------------------------------------------------- +(int) executeTaskWithAuth:(NSString*) taskName arguments:(NSArray *)args authExtForm:(NSData*)auth { - NSLog(taskName); NSString *result = nil; int status = 0; NSFileHandle *file = nil; @@ -103,7 +99,6 @@ [taskToRun waitUntilExit]; status = [taskToRun terminationStatus]; if (status == 0){ - NSLog(@"Task succeeded."); NSData *data = [file readDataToEndOfFile]; // remove the \n character from unix command if([data length] > 0){ @@ -113,11 +108,9 @@ [taskToRun release]; result = [[NSString alloc] initWithData: realData encoding: NSUTF8StringEncoding]; - NSLog(result); [result release]; } } else { - NSLog(@"Task failed."); } return status; diff --git a/src/platform/DARWIN/AFSPreference/TokenCredentialController.m b/src/platform/DARWIN/AFSPreference/TokenCredentialController.m index 55adfea2e..523003ab2 100644 --- a/src/platform/DARWIN/AFSPreference/TokenCredentialController.m +++ b/src/platform/DARWIN/AFSPreference/TokenCredentialController.m @@ -15,7 +15,6 @@ // ------------------------------------------------------------------------------- - (void)awakeFromNib { - NSLog(@"awakeFromNib"); } -- 2.39.5