@@ -109,12 +109,12 @@
 			char *buffer = [self allocMemoryWithSize: of_pagesize];
 
 			while (![file isAtEndOfStream]) {
 				size_t length;
 
-				length = [file readNBytes: of_pagesize
-					       intoBuffer: buffer];
+				length = [file readIntoBuffer: buffer
+						       length: of_pagesize];
 				[self addItemsFromCArray: buffer
 						   count: length];
 			}
 
 			[self freeMemory: buffer];
@@ -435,12 +435,12 @@
 {
 	OFFile *file = [[OFFile alloc] initWithPath: path
 					       mode: @"wb"];
 
 	@try {
-		[file writeNBytes: count * itemSize
-		       fromBuffer: data];
+		[file writeBuffer: data
+			   length: count * itemSize];
 	} @finally {
 		[file release];
 	}
 }