From c275147fb17de6b090b3e5af1ef911a266d8cc0c Mon Sep 17 00:00:00 2001 From: hborders Date: Mon, 16 Jul 2012 10:11:38 -0500 Subject: [PATCH] Run static analyzer on build. Fixed warnings. Warnings were all about use of uninitialized values. Initialized values to zero or nil in unintialized cases. --- Classes/MGSplitViewController.m | 13 +++++++++---- MGSplitView.xcodeproj/project.pbxproj | 3 +++ 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/Classes/MGSplitViewController.m b/Classes/MGSplitViewController.m index 61b30a6..4d92831 100644 --- a/Classes/MGSplitViewController.m +++ b/Classes/MGSplitViewController.m @@ -438,7 +438,10 @@ - (void)layoutSubviewsForInterfaceOrientation:(UIInterfaceOrientation)theOrienta } else if ([_cornerViews count] == 2) { leadingCorners = [_cornerViews objectAtIndex:0]; trailingCorners = [_cornerViews objectAtIndex:1]; - } + } else { + leadingCorners = nil; + trailingCorners = nil; + } // Configure and layout the corner-views. leadingCorners.cornersPosition = (_vertical) ? MGCornersPositionLeadingVertical : MGCornersPositionLeadingHorizontal; @@ -935,7 +938,7 @@ - (void)setViewControllers:(NSArray *)controllers - (UIViewController *)masterViewController { if (_viewControllers && [_viewControllers count] > 0) { - NSObject *controller = [_viewControllers objectAtIndex:0]; + UIViewController *controller = [_viewControllers objectAtIndex:0]; if ([controller isKindOfClass:[UIViewController class]]) { return [[controller retain] autorelease]; } @@ -977,7 +980,7 @@ - (void)setMasterViewController:(UIViewController *)master - (UIViewController *)detailViewController { if (_viewControllers && [_viewControllers count] > 1) { - NSObject *controller = [_viewControllers objectAtIndex:1]; + UIViewController *controller = [_viewControllers objectAtIndex:1]; if ([controller isKindOfClass:[UIViewController class]]) { return [[controller retain] autorelease]; } @@ -1078,7 +1081,9 @@ - (void)setDividerStyle:(MGSplitViewDividerStyle)newStyle cornerRadius = MG_PANESPLITTER_CORNER_RADIUS; _splitWidth = MG_PANESPLITTER_SPLIT_WIDTH; self.allowsDraggingDivider = YES; - } + } else { + cornerRadius = 0; + } // Update divider and corners. [_dividerView setNeedsDisplay]; diff --git a/MGSplitView.xcodeproj/project.pbxproj b/MGSplitView.xcodeproj/project.pbxproj index b0a889d..1fc89d9 100755 --- a/MGSplitView.xcodeproj/project.pbxproj +++ b/MGSplitView.xcodeproj/project.pbxproj @@ -176,6 +176,7 @@ isa = PBXProject; buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "MGSplitView" */; compatibilityVersion = "Xcode 3.2"; + developmentRegion = English; hasScannedForEncodings = 1; knownRegions = ( English, @@ -235,6 +236,7 @@ GCC_VERSION = com.apple.compilers.llvm.clang.1_0; INFOPLIST_FILE = "MGSplitView-Info.plist"; PRODUCT_NAME = MGSplitView; + RUN_CLANG_STATIC_ANALYZER = YES; }; name = Debug; }; @@ -248,6 +250,7 @@ GCC_VERSION = com.apple.compilers.llvm.clang.1_0; INFOPLIST_FILE = "MGSplitView-Info.plist"; PRODUCT_NAME = MGSplitView; + RUN_CLANG_STATIC_ANALYZER = YES; VALIDATE_PRODUCT = YES; }; name = Release;