aboutsummaryrefslogtreecommitdiffstats
path: root/Source/SPSQLParser.m
diff options
context:
space:
mode:
authorAbhi Beckert <abhi@Twist-of-Lemon-2.local>2015-05-16 08:06:06 +1000
committerAbhi Beckert <abhi@Twist-of-Lemon-2.local>2015-05-16 08:06:06 +1000
commit57a6f6c73bdaa202164645370d37fcbe5d14a092 (patch)
treedd30aa6156064f1d4c0e10ea87059625470fc2f9 /Source/SPSQLParser.m
parentb5e972f4504043dfb9c358e272e93fb59ae2127f (diff)
parent0f0c43eb74408b6a65a42e2c6fd46f4142ef8e3f (diff)
downloadsequelpro-57a6f6c73bdaa202164645370d37fcbe5d14a092.tar.gz
sequelpro-57a6f6c73bdaa202164645370d37fcbe5d14a092.tar.bz2
sequelpro-57a6f6c73bdaa202164645370d37fcbe5d14a092.zip
Merge remote-tracking branch 'sequelpro/master'
Diffstat (limited to 'Source/SPSQLParser.m')
-rw-r--r--Source/SPSQLParser.m9
1 files changed, 4 insertions, 5 deletions
diff --git a/Source/SPSQLParser.m b/Source/SPSQLParser.m
index d9162a66..d9bec2eb 100644
--- a/Source/SPSQLParser.m
+++ b/Source/SPSQLParser.m
@@ -790,8 +790,7 @@ TO_BUFFER_STATE to_scan_string (const char *);
// Drop back to standard non-delimiter mode if the delimiter has ended
if ([delimiter isEqualToString:[NSString stringWithFormat:@"%C", character]]) {
- if (delimiter) [delimiter release];
- delimiter = nil;
+ if (delimiter) SPClear(delimiter);
delimiterLengthMinusOne = 0;
}
@@ -1021,7 +1020,7 @@ TO_BUFFER_STATE to_scan_string (const char *);
}
- (void) setString:(NSString *)aString {
[string setString:aString];
- if (delimiter) [delimiter release], delimiter = nil;
+ if (delimiter) SPClear(delimiter);
delimiterLengthMinusOne = 0;
lastMatchIsDelimiter = NO;
[self _clearCharCache];
@@ -1039,8 +1038,8 @@ TO_BUFFER_STATE to_scan_string (const char *);
[self _clearCharCache];
}
- (void) dealloc {
- [string release];
- if (delimiter) [delimiter release];
+ SPClear(string);
+ if (delimiter) SPClear(delimiter);
if (charCacheEnd != -1) free(stringCharCache);
[super dealloc];
}