@@ -83,45 +83,10 @@
 - initWithArchiveFile: (OFString*)path
 	       offset: (off_t)offset
       localFileHeader: (OFZIPArchive_LocalFileHeader*)localFileHeader;
 @end
 
-void
-of_zip_archive_find_extra_field(OFDataArray *extraField, uint16_t tag,
-    uint8_t **data, uint16_t *size)
-{
-	uint8_t *bytes;
-	size_t i, count;
-
-	bytes = [extraField items];
-	count = [extraField count];
-
-	for (i = 0; i < count;) {
-		uint16_t currentTag, currentSize;
-
-		if (i + 3 >= count)
-			@throw [OFInvalidFormatException exception];
-
-		currentTag = (bytes[i + 1] << 8) | bytes[i];
-		currentSize = (bytes[i + 3] << 8) | bytes[i + 2];
-
-		if (i + 3 + currentSize >= count)
-			@throw [OFInvalidFormatException exception];
-
-		if (currentTag == tag) {
-			*data = bytes + i + 4;
-			*size = currentSize;
-			return;
-		}
-
-		i += 4 + currentSize;
-	}
-
-	*data = NULL;
-	*size = 0;
-}
-
 uint32_t
 of_zip_archive_read_field32(uint8_t **data, uint16_t *size)
 {
 	uint32_t field = 0;
 	uint_fast8_t i;
@@ -428,11 +393,11 @@
 		_fileName = [[file readStringWithLength: fileNameLength
 					       encoding: encoding] copy];
 		_extraField = [[file
 		    readDataArrayWithCount: extraFieldLength] retain];
 
-		of_zip_archive_find_extra_field(_extraField, 0x0001,
+		of_zip_archive_entry_find_extra_field(_extraField, 0x0001,
 		    &ZIP64, &ZIP64Size);
 
 		if (ZIP64 != NULL) {
 			if (_uncompressedSize == 0xFFFFFFFF)
 				_uncompressedSize = of_zip_archive_read_field64(