@@ -498,12 +498,12 @@
 
 	@try {
 		[self readIntoBuffer: tmp
 			 exactLength: count * itemSize];
 
-		[dataArray addItemsFromCArray: tmp
-					count: count];
+		[dataArray addItems: tmp
+			      count: count];
 	} @finally {
 		[self freeMemory: tmp];
 	}
 
 	return dataArray;
@@ -521,12 +521,12 @@
 		while (![self isAtEndOfStream]) {
 			size_t length;
 
 			length = [self readIntoBuffer: buffer
 					       length: of_pagesize];
-			[dataArray addItemsFromCArray: buffer
-						count: length];
+			[dataArray addItems: buffer
+				      count: length];
 		}
 	} @finally {
 		[self freeMemory: buffer];
 	}
 
@@ -1355,14 +1355,14 @@
 
 - (size_t)writeDataArray: (OFDataArray*)dataArray
 {
 	size_t length = [dataArray count] * [dataArray itemSize];
 
-	[self writeBuffer: [dataArray cArray]
+	[self writeBuffer: [dataArray items]
 		   length: length];
 
-	return [dataArray count] * [dataArray itemSize];
+	return length;
 }
 
 - (size_t)writeString: (OFString*)string
 {
 	size_t length = [string UTF8StringLength];