Formalize [x release], x = nil; convention

Take this commit as a proposal to formalize our existing "[x release], x = nil;" convention by introducing a macro for it.
Feel free to revert this commit if you see issues with the approch or implementation.

1 files changed, 10 insertions, 10 deletions

diff --git a/Source/SPDatabaseData.m b/Source/SPDatabaseData.m
index 58ffa2d2..4856505d 100644
--- a/Source/SPDatabaseData.m
+++ b/Source/SPDatabaseData.m
@@ -82,11 +82,11 @@ NSInteger _sortStorageEngineEntry(NSDictionary *itemOne, NSDictionary *itemTwo,
  */
 - (void)resetAllData
 {
-	if (characterSetEncoding != nil) [characterSetEncoding release], characterSetEncoding = nil;
-	if (defaultCollation != nil) [defaultCollation release], defaultCollation = nil;
-	if (defaultCharacterSetEncoding != nil) [defaultCharacterSetEncoding release], defaultCharacterSetEncoding = nil;
-	if (serverDefaultCharacterSetEncoding) [serverDefaultCharacterSetEncoding release], serverDefaultCharacterSetEncoding = nil;
-	if (serverDefaultCollation) [serverDefaultCollation release], serverDefaultCollation = nil;
+	if (characterSetEncoding != nil) SPClear(characterSetEncoding);
+	if (defaultCollation != nil) SPClear(defaultCollation);
+	if (defaultCharacterSetEncoding != nil) SPClear(defaultCharacterSetEncoding);
+	if (serverDefaultCharacterSetEncoding) SPClear(serverDefaultCharacterSetEncoding);
+	if (serverDefaultCollation) SPClear(serverDefaultCollation);
 	
 	[collations removeAllObjects];
 	[characterSetCollations removeAllObjects];
@@ -489,11 +489,11 @@ NSInteger _sortStorageEngineEntry(NSDictionary *itemOne, NSDictionary *itemTwo,
 {
 	[self resetAllData];
 	
-	[collations release], collations = nil;
-	[characterSetCollations release], characterSetCollations = nil;
-	[storageEngines release], storageEngines = nil;
-	[characterSetEncodings release], characterSetEncodings = nil;
-	[cachedCollationsByEncoding release], cachedCollationsByEncoding = nil;
+	SPClear(collations);
+	SPClear(characterSetCollations);
+	SPClear(storageEngines);
+	SPClear(characterSetEncodings);
+	SPClear(cachedCollationsByEncoding);
 	
 	[super dealloc];
 }