diff options
author | stuconnolly <stuart02@gmail.com> | 2011-03-19 15:05:23 +0000 |
---|---|---|
committer | stuconnolly <stuart02@gmail.com> | 2011-03-19 15:05:23 +0000 |
commit | 6d3f21336846d7745e795202c99390832c4220c8 (patch) | |
tree | 6195dafeeb1871afc5e41f6f17a917dc8047d44a /Source/SPCSVParser.m | |
parent | b2a0af91eae18b6490ddeafd2708d256b0d53cb3 (diff) | |
download | sequelpro-6d3f21336846d7745e795202c99390832c4220c8.tar.gz sequelpro-6d3f21336846d7745e795202c99390832c4220c8.tar.bz2 sequelpro-6d3f21336846d7745e795202c99390832c4220c8.zip |
Bring outline view branch up to date with trunk (r3235:r3245), which should resolve all warnings.
Diffstat (limited to 'Source/SPCSVParser.m')
-rw-r--r-- | Source/SPCSVParser.m | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Source/SPCSVParser.m b/Source/SPCSVParser.m index f19c2d55..5429896e 100644 --- a/Source/SPCSVParser.m +++ b/Source/SPCSVParser.m @@ -121,7 +121,7 @@ j = 1; isEscaped = NO; if (!escapeStringIsFieldQuoteString) { - while (j * escapeLength <= nextQuoteDistance + while (j * escapeLength <= (NSInteger)nextQuoteDistance && ([[csvString substringWithRange:NSMakeRange((parserPosition + nextQuoteDistance - (j*escapeLength)), escapeLength)] isEqualToString:escapeString])) { isEscaped = !isEscaped; @@ -203,7 +203,7 @@ if (escapeLength) { j = 1; isEscaped = NO; - while (j * escapeLength <= nextFieldEndDistance + while (j * escapeLength <= (NSInteger)nextFieldEndDistance && ([[csvString substringWithRange:NSMakeRange((parserPosition + nextFieldEndDistance - (j*escapeLength)), escapeLength)] isEqualToString:escapeString])) { isEscaped = !isEscaped; @@ -298,7 +298,7 @@ // to allow to replace these by the table column's DEFAULT value) if (fieldCount == NSNotFound) { fieldCount = [csvRowArray count]; - } else if ([csvRowArray count] < fieldCount) { + } else if ([csvRowArray count] < (NSUInteger)fieldCount) { for (j = [csvRowArray count]; j < fieldCount; j++) [csvRowArray addObject:[SPNotLoaded notLoaded]]; } |