aboutsummaryrefslogtreecommitdiffstats
path: root/Source/SPCSVParser.m
diff options
context:
space:
mode:
authorstuconnolly <stuart02@gmail.com>2011-03-07 20:12:52 +0000
committerstuconnolly <stuart02@gmail.com>2011-03-07 20:12:52 +0000
commit1e5288e9840e201a00bcb5ca3035d7aa807f1f8d (patch)
tree0c1a47953f57b71c41cc7a63e156629c6c9d645b /Source/SPCSVParser.m
parent915a3831525bf3a9350648d82f86dd54ae366292 (diff)
downloadsequelpro-1e5288e9840e201a00bcb5ca3035d7aa807f1f8d.tar.gz
sequelpro-1e5288e9840e201a00bcb5ca3035d7aa807f1f8d.tar.bz2
sequelpro-1e5288e9840e201a00bcb5ca3035d7aa807f1f8d.zip
Bring outline view branch up to date with trunk (r3203:r3224).
Diffstat (limited to 'Source/SPCSVParser.m')
-rw-r--r--Source/SPCSVParser.m8
1 files changed, 4 insertions, 4 deletions
diff --git a/Source/SPCSVParser.m b/Source/SPCSVParser.m
index f1e63c72..f19c2d55 100644
--- a/Source/SPCSVParser.m
+++ b/Source/SPCSVParser.m
@@ -48,7 +48,7 @@
totalLengthParsed = 0;
// Loop through the results fetching process
- while (csvRowArray = [self getRowAsArrayAndTrimString:NO stringIsComplete:YES])
+ while ((csvRowArray = [self getRowAsArrayAndTrimString:NO stringIsComplete:YES]))
{
CFArrayAppendValue((CFMutableArrayRef)csvArray, csvRowArray);
}
@@ -603,7 +603,7 @@
#pragma mark -
- (id) init {
- if (self = [super init]) {
+ if ((self = [super init])) {
csvString = [[NSMutableString alloc] init];
[self _initialiseCSVParserDefaults];
}
@@ -611,14 +611,14 @@
}
- (id) initWithString:(NSString *)aString
{
- if (self = [super init]) {
+ if ((self = [super init])) {
csvString = [[NSMutableString alloc] initWithString:aString];
[self _initialiseCSVParserDefaults];
}
return self;
}
- (id) initWithContentsOfFile:(NSString *)path encoding:(NSStringEncoding)encoding error:(NSError **)error {
- if (self = [super init]) {
+ if ((self = [super init])) {
csvString = [[NSMutableString alloc] initWithContentsOfFile:path encoding:encoding error:error];
[self _initialiseCSVParserDefaults];
}