Fix newly identified build warnings.

Signed-off-by: Jonathan 'Wolf' Rentzsch <jwr.git@redshed.net>
rentzsch · Feb 21, 2009 · 69c0083 · 69c0083
1 parent cf6dfbb
commit 69c0083
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 7 deletions.
diff --git a/Plugin/CTFMenubarMenuController.h b/Plugin/CTFMenubarMenuController.h
@@ -33,7 +33,7 @@ extern NSString* kCTFLoadAllFlashViews;
 extern NSString* kCTFLoadFlashViewsForWindow;
 extern NSString* kCTFLoadInvisibleFlashViewsForWindow;
 
-extern NSUInteger maxInvisibleDimension;
+extern NSInteger maxInvisibleDimension;
 
 
 @interface CTFMenubarMenuController : NSObject {

diff --git a/Plugin/CTFMenubarMenuController.m b/Plugin/CTFMenubarMenuController.m
@@ -33,7 +33,7 @@ of this software and associated documentation files (the "Software"), to deal
 NSString* kCTFLoadFlashViewsForWindow = @"CTFLoadFlashViewsForWindow";
 NSString* kCTFLoadInvisibleFlashViewsForWindow = @"CTFLoadInvisibleFlashViewsForWindow";
 
-NSUInteger maxInvisibleDimension = 8;
+NSInteger maxInvisibleDimension = 8;
 
 
 static NSString* kApplicationsToInstallMenuInto[] = {
@@ -85,7 +85,7 @@ - (int) applicationMenuPrefsInsertionLocation
     if( indx ) {
         insertLocation = [ indx intValue ];
 	} else {
-		int showPrefsItem = -1, lastSeenSep = -1;
+		int showPrefsItem = -1;
 		int i;
 		for( i = 0 ; i < count ; ++i ) {
 			// Put it before the first separator after the preferences item.
@@ -227,7 +227,7 @@ - (BOOL) _flashViewExistsForKeyWindowWithInvisibleOnly: (BOOL) mustBeInvisible
 
 	NSHashEnumerator enumerator = NSEnumerateHashTable( _views );
 	CTFClickToFlashPlugin* item;
-	while( item = NSNextHashEnumeratorItem( &enumerator ) ) {
+	while( ( item = NSNextHashEnumeratorItem( &enumerator ) ) ) {
 		if( [ item window ] == keyWindow ) {
 			if( !mustBeInvisible || [ item isConsideredInvisible ] ) {
 				rslt = YES;

diff --git a/Plugin/CTFUtilities.h b/Plugin/CTFUtilities.h
@@ -30,5 +30,5 @@ THE SOFTWARE.
 #define CTFForEachObject( Type, varName, container ) \
     NSEnumerator* feoEnum_##__LINE__ = [ container objectEnumerator ]; \
     Type* varName; \
-    while( varName = [ feoEnum_##__LINE__ nextObject ] )
+    while( ( varName = [ feoEnum_##__LINE__ nextObject ] ) )
 
diff --git a/Plugin/CTFsIFRSupport.m b/Plugin/CTFsIFRSupport.m
@@ -108,8 +108,7 @@ - (BOOL) _isSIFRText: (NSDictionary*) arguments
     NSString* classValue = [[arguments objectForKey: WebPlugInAttributesKey] objectForKey: @"class"];
     NSString* sifrValue = [[arguments objectForKey: WebPlugInAttributesKey] objectForKey: @"sifr"];
 
-    if ([classValue isEqualToString: @"sIFR-flash"] || (sifrValue && [sifrValue boolValue]))
-        return YES;
+    return [classValue isEqualToString: @"sIFR-flash"] || (sifrValue && [sifrValue boolValue]);
 }
 
 @end