nil ivars in -dealloc

jwang · May 6, 2011 · 5ddd0e6 · 5ddd0e6
1 parent 6591d1a
commit 5ddd0e6
Show file tree

Hide file tree

Showing 8 changed files with 32 additions and 29 deletions.
diff --git a/InAppSettingsKit/Controllers/IASKAppSettingsViewController.m b/InAppSettingsKit/Controllers/IASKAppSettingsViewController.m
@@ -223,18 +223,15 @@ - (void)navigationController:(UINavigationController *)navigationController will
 
 - (void)dealloc {
     [[NSNotificationCenter defaultCenter] removeObserver:self];
-    [_viewList release];
-    [_currentIndexPath release];
-	[_file release];
-	_file = nil;
-
-	[_currentFirstResponder release];
-	_currentFirstResponder = nil;
-
-    [_settingsReader release];
-    [_settingsStore release];
-
+
+    [_viewList release], _viewList = nil;
+    [_currentIndexPath release], _currentIndexPath = nil;
+	[_file release], _file = nil;
+	[_currentFirstResponder release], _currentFirstResponder = nil;
+	[_settingsReader release], _settingsReader = nil;
+    [_settingsStore release], _settingsStore = nil;
 	[_tableView release], _tableView = nil;
+
 	_delegate = nil;
 
     [super dealloc];

diff --git a/InAppSettingsKit/Controllers/IASKSpecifierValuesViewController.m b/InAppSettingsKit/Controllers/IASKSpecifierValuesViewController.m
@@ -101,10 +101,10 @@ - (void)viewDidUnload {
 
 
 - (void)dealloc {
-    [_currentSpecifier release];
-    [_checkedItem release];
-	[_settingsReader release];
-    [_settingsStore release];
+    [_currentSpecifier release], _currentSpecifier = nil;
+	[_checkedItem release], _checkedItem = nil;
+	[_settingsReader release], _settingsReader = nil;
+    [_settingsStore release], _settingsStore = nil;
 	[_tableView release], _tableView = nil;
     [super dealloc];
 }

diff --git a/InAppSettingsKit/Models/IASKSettingsReader.m b/InAppSettingsKit/Models/IASKSettingsReader.m
@@ -69,12 +69,13 @@ - (id)initWithFile:(NSString*)file {
 }
 
 - (void)dealloc {
-    [_path release];
-	[_localizationTable release];
-	[_bundlePath release];
-    [_settingsBundle release];
-    [_dataSource release];
-    [_bundle release];
+    [_path release], _path = nil;
+	[_localizationTable release], _localizationTable = nil;
+	[_bundlePath release], _bundlePath = nil;
+    [_settingsBundle release], _settingsBundle = nil;
+    [_dataSource release], _dataSource = nil;
+    [_bundle release], _bundle = nil;
+
     [super dealloc];
 }
 

diff --git a/InAppSettingsKit/Models/IASKSettingsStoreFile.m b/InAppSettingsKit/Models/IASKSettingsStoreFile.m
@@ -32,8 +32,9 @@ - (id)initWithPath:(NSString*)path {
 }
 
 - (void)dealloc {
-    [_dict release];
-    [_filePath release];
+    [_dict release], _dict = nil;
+    [_filePath release], _filePath = nil;
+
     [super dealloc];
 }
 

diff --git a/InAppSettingsKit/Models/IASKSpecifier.m b/InAppSettingsKit/Models/IASKSpecifier.m
@@ -41,10 +41,11 @@ - (id)initWithSpecifier:(NSDictionary*)specifier {
 }
 
 - (void)dealloc {
-    [_specifierDict release];
-    [_multipleValuesDict release];
-	_settingsReader = nil;
+    [_specifierDict release], _specifierDict = nil;
+    [_multipleValuesDict release], _multipleValuesDict = nil;
 
+	_settingsReader = nil;
+
     [super dealloc];
 }
 

diff --git a/InAppSettingsKit/Views/IASKSlider.m b/InAppSettingsKit/Views/IASKSlider.m
@@ -22,7 +22,8 @@ @implementation IASKSlider
 @synthesize key=_key;
 
 - (void)dealloc {
-    [_key release];
+    [_key release], _key = nil;
+
     [super dealloc];
 }
 

diff --git a/InAppSettingsKit/Views/IASKSwitch.m b/InAppSettingsKit/Views/IASKSwitch.m
@@ -22,7 +22,8 @@ @implementation IASKSwitch
 @synthesize key=_key;
 
 - (void)dealloc {
-    [_key release];
+    [_key release], _key = nil;
+
     [super dealloc];
 }
 

diff --git a/InAppSettingsKit/Views/IASKTextField.m b/InAppSettingsKit/Views/IASKTextField.m
@@ -22,7 +22,8 @@ @implementation IASKTextField
 @synthesize key=_key;
 
 - (void)dealloc {
-    [_key release];
+    [_key release], _key = nil;
+
     [super dealloc];
 }