Fix warnings, and get rid of the un-needed sshnodelay.so.

mgorbach · Nov 27, 2010 · 781ab2e · 781ab2e
1 parent 2fe4d6b
commit 781ab2e
Show file tree

Hide file tree

Showing 21 changed files with 46 additions and 19 deletions.
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,2 @@
+*.mode1v3
+*.pbxuser
diff --git a/IconFamily.m b/IconFamily.m
@@ -1229,7 +1229,7 @@ + (Handle) get32BitDataFromBitmapImageRep:(NSBitmapImageRep*)bitmapImageRep requ
 	}
     if (bitsPerSample != 8)
 	{
-		NSLog(@"get32BitDataFromBitmapImageRep:requiredPixelSize: returning NULL due to bitsPerSample == %d", bitsPerSample);
+		NSLog(@"get32BitDataFromBitmapImageRep:requiredPixelSize: returning NULL due to bitsPerSample == %lu", bitsPerSample);
 		return NULL;
 	}
 
@@ -1280,7 +1280,7 @@ + (Handle) get32BitDataFromBitmapImageRep:(NSBitmapImageRep*)bitmapImageRep requ
 	}
 	else
 	{
-		NSLog(@"get32BitDataFromBitmapImageRep:requiredPixelSize: returning NULL due to samplesPerPixel == %d, bitsPerPixel == %", samplesPerPixel, bitsPerPixel);
+		NSLog(@"get32BitDataFromBitmapImageRep:requiredPixelSize: returning NULL due to samplesPerPixel == %lu, bitsPerPixel == %lu", samplesPerPixel, bitsPerPixel);
 		return NULL;
 	}
 
@@ -1319,7 +1319,7 @@ + (Handle) get8BitDataFromBitmapImageRep:(NSBitmapImageRep*)bitmapImageRep requi
 	}
     if (bitsPerSample != 8)
 	{
-		NSLog(@"get8BitDataFromBitmapImageRep:requiredPixelSize: returning NULL due to bitsPerSample == %d", bitsPerSample);
+		NSLog(@"get8BitDataFromBitmapImageRep:requiredPixelSize: returning NULL due to bitsPerSample == %lu", bitsPerSample);
 		return NULL;
 	}
 
@@ -1369,7 +1369,7 @@ + (Handle) get8BitDataFromBitmapImageRep:(NSBitmapImageRep*)bitmapImageRep requi
 	}
 	else
 	{
-		NSLog(@"get8BitDataFromBitmapImageRep:requiredPixelSize: returning NULL due to samplesPerPixel == %d, bitsPerPixel == %", samplesPerPixel, bitsPerPixel);
+		NSLog(@"get8BitDataFromBitmapImageRep:requiredPixelSize: returning NULL due to samplesPerPixel == %lu, bitsPerPixel == %lu", samplesPerPixel, bitsPerPixel);
 		return NULL;
 	}
 
@@ -1408,7 +1408,7 @@ + (Handle) get8BitMaskFromBitmapImageRep:(NSBitmapImageRep*)bitmapImageRep requi
 	}
     if (bitsPerSample != 8)
 	{
-		NSLog(@"get8BitMaskFromBitmapImageRep:requiredPixelSize: returning NULL due to bitsPerSample == %d", bitsPerSample);
+		NSLog(@"get8BitMaskFromBitmapImageRep:requiredPixelSize: returning NULL due to bitsPerSample == %lu", bitsPerSample);
 		return NULL;
 	}
 
@@ -1445,7 +1445,7 @@ + (Handle) get8BitMaskFromBitmapImageRep:(NSBitmapImageRep*)bitmapImageRep requi
 	}
 	else
 	{
-		NSLog(@"get8BitMaskFromBitmapImageRep:requiredPixelSize: returning NULL due to samplesPerPixel == %d, bitsPerPixel == %", samplesPerPixel, bitsPerPixel);
+		NSLog(@"get8BitMaskFromBitmapImageRep:requiredPixelSize: returning NULL due to samplesPerPixel == %lu, bitsPerPixel == %lu", samplesPerPixel, bitsPerPixel);
 		return NULL;
 	}
 
@@ -1546,7 +1546,7 @@ + (Handle) get1BitMaskFromBitmapImageRep:(NSBitmapImageRep*)bitmapImageRep requi
 	}
 	else
 	{
-		NSLog(@"get1BitMaskFromBitmapImageRep:requiredPixelSize: returning NULL due to bitsPerPixel == %d, samplesPerPixel== %d, bitsPerSample == %d", bitsPerPixel, samplesPerPixel, bitsPerSample);
+		NSLog(@"get1BitMaskFromBitmapImageRep:requiredPixelSize: returning NULL due to bitsPerPixel == %lu, samplesPerPixel== %lu, bitsPerSample == %lu", bitsPerPixel, samplesPerPixel, bitsPerSample);
 		return NULL;
 	}
 

diff --git a/MFClientFS.m b/MFClientFS.m
@@ -22,8 +22,9 @@
 #import "IconFamily.h"
 #import "MFAdvancedViewController.h"
 #import "MGNSImage.h"
+#import "MFLogging.h"
+
 #import <QuartzCore/QuartzCore.h>
-#import "MGNSImage.h"
 
 @interface MFClientFS (PrivateAPI)
 - (void)fillInitialData;

diff --git a/MFClientFSUI.m b/MFClientFSUI.m
@@ -20,6 +20,7 @@
 #import "MFClientFSUI.h"
 #import "MFAdvancedViewController.h"
 #import "MGTransitioningTabView.h"
+#import "MFLogging.h"
 
 NSString *kMFUIMainViewKey=@"main";
 NSString *kMFUIAdvancedViewKey=@"advanced";
@@ -111,7 +112,7 @@ - (NSView *)editingView {
 			[tabView setFrame:NSMakeRect( 0, 0, tabview_x+view_width, tabview_y+150 )];
 			editingTabView = tabView;
 		} else {
-			MFLogSO(self, @"No view loaded for fs %@", self);
+			MFLogSO(self, @"No view loaded for fs %@", [self name]);
 			return nil;
 		}
 	}

diff --git a/MFCommunicationServer.m b/MFCommunicationServer.m
@@ -22,6 +22,7 @@
 #import "MFPreferences.h"
 #import "MFClientProtocol.h"
 #import "MFLogging.h"
+#import "MFCore.h"
 
 @implementation MFCommunicationServer
 static MFCommunicationServer *sharedServer = nil;

diff --git a/MFCore.m b/MFCore.m
@@ -17,6 +17,7 @@
 #import "MFCore.h"
 #import "MFConstants.h"
 #import "MFServerProtocol.h"
+#import "MFLogging.h"
 
 #define self @"MFCORE"
 

diff --git a/MFEditingController.m b/MFEditingController.m
@@ -20,6 +20,7 @@
 #import "MFEditingController.h"
 #import "MGTransitioningTabView.h"
 #import "MFClientFSUI.h"
+#import "MFLogging.h"
 
 @interface MFEditingController(PrivateAPI)
 - (id)initWithFilesystem:(MFClientFS *)fs;

diff --git a/MFFilesystem.m b/MFFilesystem.m
@@ -16,7 +16,7 @@
 
 #import "MFFilesystem.h"
 #import "MFPlugin.h"
-#import "MFConstants.h"]
+#import "MFConstants.h"
 #import "MFSecurity.h"
 
 #define FS_DIR_PATH @"~/Library/Application Support/Macfusion/Filesystems"

diff --git a/MFFilesystemController.m b/MFFilesystemController.m
@@ -20,6 +20,8 @@
 #import "MFServerFS.h"
 #import "MFError.h"
 #import "MFConstants.h"
+#import "MFLogging.h"
+
 #import <DiskArbitration/DiskArbitration.h>
 
 #define FSDEF_EXTENSION @"macfusion"
@@ -310,7 +312,7 @@ - (NSString *)tokenForFilesystem:(MFServerFS *)fs {
     NSString *tokenString = [(NSString *)string autorelease];
 	if ([[_tokens allValues] containsObject: fs]) {
 		MFLogSO(self, fs, @"Uh oh ... adding a second token for an FS already in tokens");
-		MFLogSO(self, @"Tokens Before %@", _tokens);
+		// MFLogSO(self, _tokens, @"Tokens Before %@", _tokens);
 	}
 
 	[_tokens setObject: fs forKey: tokenString];

diff --git a/MFMainController.m b/MFMainController.m
@@ -20,10 +20,11 @@
 #import "MFFilesystemController.h"
 #import "MFFilesystem.h"
 #import "MFCommunicationServer.h"
-#include <sys/xattr.h>
 #import "MFLogging.h"
 #import "MFConstants.h"
+#import "MFCore.h"
 
+#include <sys/xattr.h>
 @implementation MFMainController
 static MFMainController* sharedController = nil;
 

diff --git a/MFPlugin.m b/MFPlugin.m
@@ -16,6 +16,7 @@
 
 #import "MFPlugin.h"
 #import "MFConstants.h"
+#import "MFLogging.h"
 
 @interface MFPlugin(PrivateAPI)
 @end

diff --git a/MFPluginController.m b/MFPluginController.m
@@ -18,6 +18,7 @@
 #import "MFServerPlugin.h"
 #import "MFServerFS.h"
 #import "MFCore.h"
+#import "MFLogging.h"
 
 #define PLUGIN_EXTENSION @"mfplugin"
 

diff --git a/MFPreferences.m b/MFPreferences.m
@@ -7,6 +7,8 @@
 //
 
 #import "MFPreferences.h"
+#import "MFLogging.h"
+
 #import <Carbon/Carbon.h>
 
 #define PREFS_FILE_PATH @"~/Library/Application Support/Macfusion/Preferences/preferences.plist"

diff --git a/MFPreferencesController.m b/MFPreferencesController.m
@@ -18,6 +18,7 @@
 #import "MFCore.h"
 #import "MFClient.h"
 #import "MFPreferences.h"
+#import "MFLogging.h"
 
 #define kMFPrefsPluginToolbarIdentifier @"Plugin"
 #define kMFPrefsGeneralToolbarIdentifier @"General"

diff --git a/MFSecurity.m b/MFSecurity.m
@@ -72,8 +72,7 @@
 	SecProtocolType protocol = [[[fs parameters] objectForKey:kNetFSProtocolParameter] intValue];
 
 	if (userName && hostName && port && protocol) {
-		OSStatus error = SecKeychainFindInternetPassword(NULL,[hostName lengthOfBytesUsingEncoding: NSUTF8StringEncoding],[hostName UTF8String],0,NULL,[userName lengthOfBytesUsingEncoding: NSUTF8StringEncoding],[userName UTF8String],0,NULL,port,protocol,
-														  (SecAuthenticationType)NULL,&passwordLength,&passwordData,itemRef);
+		OSStatus error = SecKeychainFindInternetPassword(NULL,[hostName lengthOfBytesUsingEncoding: NSUTF8StringEncoding],[hostName UTF8String],0,NULL,[userName lengthOfBytesUsingEncoding: NSUTF8StringEncoding],[userName UTF8String],0,NULL,port,protocol,(SecAuthenticationType)NULL,&passwordLength,&passwordData,itemRef);
 		if (error == noErr) {
 			// MFLogS(self, @"Successfully found internet password for fs %@", fs);
 			NSString *password = [NSString stringWithCString:passwordData encoding:NSUTF8StringEncoding];

diff --git a/MFServerFS.m b/MFServerFS.m
@@ -21,6 +21,8 @@
 #import "MFLogging.h"
 #import "MFPreferences.h"
 
+#import <sys/xattr.h>
+
 #define FS_DIR_PATH @"~/Library/Application Support/Macfusion/Filesystems"
 
 @interface MFServerFS (PrivateAPI)

diff --git a/MacFusion2.xcodeproj/project.pbxproj b/MacFusion2.xcodeproj/project.pbxproj
@@ -111,7 +111,6 @@
 		D49059750D35681F00E21C1E /* AppKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D49059740D35681F00E21C1E /* AppKit.framework */; };
 		D4905C330D393F8300E21C1E /* MFClientPlugin.h in Headers */ = {isa = PBXBuildFile; fileRef = D4905C310D393F8300E21C1E /* MFClientPlugin.h */; };
 		D4905C340D393F8300E21C1E /* MFClientPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = D4905C320D393F8300E21C1E /* MFClientPlugin.m */; };
-		D4B14BC90CE03D25003195A3 /* sshnodelay.so in Resources */ = {isa = PBXBuildFile; fileRef = D4B14BAA0CE03C84003195A3 /* sshnodelay.so */; };
 		D4B14BCB0CE03D25003195A3 /* sshfs-static in Resources */ = {isa = PBXBuildFile; fileRef = D4B14BAC0CE03C84003195A3 /* sshfs-static */; };
 		D4B14D740CE195CB003195A3 /* mfctl.m in Sources */ = {isa = PBXBuildFile; fileRef = D4B14D730CE195CB003195A3 /* mfctl.m */; };
 		D4B14EE30CE2468B003195A3 /* MFLogging.h in Headers */ = {isa = PBXBuildFile; fileRef = D4B14EE10CE2468B003195A3 /* MFLogging.h */; };
@@ -437,7 +436,6 @@
 		D4905C6C0D394A5D00E21C1E /* MFServerFS.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MFServerFS.m; sourceTree = "<group>"; };
 		D4905C6E0D394A6700E21C1E /* MFServerPlugin.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MFServerPlugin.h; sourceTree = "<group>"; };
 		D4905C6F0D394A6700E21C1E /* MFServerPlugin.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MFServerPlugin.m; sourceTree = "<group>"; };
-		D4B14BAA0CE03C84003195A3 /* sshnodelay.so */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; path = sshnodelay.so; sourceTree = "<group>"; };
 		D4B14BAC0CE03C84003195A3 /* sshfs-static */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.executable"; path = "sshfs-static"; sourceTree = "<group>"; };
 		D4B14C0F0CE03F4C003195A3 /* sshfs-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "sshfs-Info.plist"; sourceTree = "<group>"; };
 		D4B14C840CE0455A003195A3 /* MFPluginController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MFPluginController.h; sourceTree = "<group>"; };
@@ -840,7 +838,6 @@
 				D4656C8C0D6FD6DC00DE2208 /* sshfs.png */,
 				D439D6D50D0A0FDE0025574A /* sshfsConfiguration.xib */,
 				D4B14C0F0CE03F4C003195A3 /* sshfs-Info.plist */,
-				D4B14BAA0CE03C84003195A3 /* sshnodelay.so */,
 				D4B14BAC0CE03C84003195A3 /* sshfs-static */,
 				D41316310D7F740400F55B9B /* sshfsAdvanced.xib */,
 			);
@@ -1230,7 +1227,14 @@
 			isa = PBXProject;
 			buildConfigurationList = 1DEB927808733DD40010E9CD /* Build configuration list for PBXProject "MacFusion2" */;
 			compatibilityVersion = "Xcode 3.0";
+			developmentRegion = English;
 			hasScannedForEncodings = 1;
+			knownRegions = (
+				English,
+				Japanese,
+				French,
+				German,
+			);
 			mainGroup = 08FB7794FE84155DC02AAC07 /* macfusiond */;
 			projectDirPath = "";
 			projectRoot = "";
@@ -1283,7 +1287,6 @@
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				D4B14BC90CE03D25003195A3 /* sshnodelay.so in Resources */,
 				D4B14BCB0CE03D25003195A3 /* sshfs-static in Resources */,
 				D439D6D60D0A0FDE0025574A /* sshfsConfiguration.xib in Resources */,
 				D4656C8D0D6FD6DC00DE2208 /* sshfs_icon.icns in Resources */,
@@ -1575,6 +1578,7 @@
 			buildSettings = {
 				ARCHS = "$(ARCHS_STANDARD_32_64_BIT_PRE_XCODE_3_1)";
 				ARCHS_STANDARD_32_64_BIT_PRE_XCODE_3_1 = "x86_64 i386 ppc";
+				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				PREBINDING = NO;
@@ -1688,6 +1692,7 @@
 			buildSettings = {
 				ARCHS = "$(ARCHS_STANDARD_32_64_BIT_PRE_XCODE_3_1)";
 				ARCHS_STANDARD_32_64_BIT_PRE_XCODE_3_1 = "x86_64 i386 ppc";
+				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				ONLY_ACTIVE_ARCH = NO;
@@ -1963,6 +1968,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ARCHS = "$(ONLY_ACTIVE_ARCH_PRE_XCODE_3_1)";
+				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				ONLY_ACTIVE_ARCH_PRE_XCODE_3_1 = "$(NATIVE_ARCH_ACTUAL)";
@@ -2572,6 +2578,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ARCHS = "$(ONLY_ACTIVE_ARCH_PRE_XCODE_3_1)";
+				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				ONLY_ACTIVE_ARCH_PRE_XCODE_3_1 = "$(NATIVE_ARCH_ACTUAL)";

diff --git a/Menuling/MFMenulingAppDelegate.m b/Menuling/MFMenulingAppDelegate.m
@@ -22,6 +22,8 @@
 #import "MFConstants.h"
 #import "MFError.h"
 #import "MFCore.h"
+#import "MFLogging.h"
+
 #import <Carbon/Carbon.h>
 
 #define MENU_ICON_SIZE 24

diff --git a/Menuling/MFQuickMountController.h b/Menuling/MFQuickMountController.h
@@ -15,7 +15,8 @@
 // limitations under the License.
 
 #import <Cocoa/Cocoa.h>
-#import "MFClientFSDelegateProtocol.h";
+
+#import "MFClientFSDelegateProtocol.h"
 
 @class MFClientFS, MFClient;
 

diff --git a/SSHFS/sshnodelay.so b/SSHFS/sshnodelay.so
diff --git a/Settings/MFSettingsController.m b/Settings/MFSettingsController.m
@@ -28,6 +28,7 @@
 #import "MFClientFSUI.h"
 #import "MFEditingController.h"
 #import "MFPreferences.h"
+#import "MFLogging.h"
 
 @interface MFSettingsController(PrivateAPI)
 - (void)editFilesystem:(MFClientFS*)fs;