Merge pull request #13 from joshorr/master

32bit compatability + format string warning fix.
davedelong · Jun 25, 2012 · 8b2cbb8 · 8b2cbb8
2 parents 825dcf1 + 1929fb5
commit 8b2cbb8
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/CHCSVParser.h b/CHCSVParser.h
@@ -43,6 +43,7 @@
 
 	NSMutableData *currentChunk;
 	NSMutableString *currentChunkString;
+	NSUInteger chunkSize;
 	NSUInteger stringIndex;
 
 	BOOL balancedQuotes;

diff --git a/CHCSVParser.m b/CHCSVParser.m
@@ -466,7 +466,7 @@ - (void) processComposedCharacter:(NSString *)currentCharacter previousCharacter
 		}
 	} else {
 		if (previousUnichar == UNICHAR_QUOTE && previousPreviousUnichar != UNICHAR_BACKSLASH && balancedQuotes == YES && balancedEscapes == YES) {
-			NSString *reason = [NSString stringWithFormat:@"Invalid CSV format on line #%lu immediately after \"%@\"", currentLine, currentField];
+			NSString *reason = [NSString stringWithFormat:@"Invalid CSV format on line #%lu immediately after \"%@\"", (unsigned long)currentLine, currentField];
 			error = [[NSError alloc] initWithDomain:CHCSVErrorDomain code:CHCSVErrorCodeInvalidFormat userInfo:[NSDictionary dictionaryWithObject:reason forKey:NSLocalizedDescriptionKey]];
 			return;
 		}