From: Tim Kientzle <kientzle@gmail.com>
Date: Sun, 20 Nov 2011 07:27:38 +0000 (-0500)
Subject: Refactor the test suite's read_open_memory a bit.
X-Git-Tag: v3.0.1b~46
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bdcc838335a3c2534bfdc64e4fd09a4e85d9fb64;p=thirdparty%2Flibarchive.git

Refactor the test suite's read_open_memory a bit.

SVN-Revision: 3810
---

diff --git a/libarchive/test/read_open_memory.c b/libarchive/test/read_open_memory.c
index 960cf63a0..c77cd5b5d 100644
--- a/libarchive/test/read_open_memory.c
+++ b/libarchive/test/read_open_memory.c
@@ -90,12 +90,14 @@ read_open_memory_internal(struct archive *a, void *buff,
 	mine->copy_buff_size = read_size + mine->copy_buff_offset * 2;
 	mine->copy_buff = malloc(mine->copy_buff_size);
 	memset(mine->copy_buff, 0xA5, mine->copy_buff_size);
-	if (fullapi)
-		return (archive_read_open2(a, mine, memory_read_open,
-			    memory_read, memory_read_skip, memory_read_close));
-	else
-		return (archive_read_open2(a, mine, NULL,
-			    memory_read, NULL, memory_read_close));
+	if (fullapi) {
+		archive_read_set_open_callback(a, memory_read_open);
+		archive_read_set_skip_callback(a, memory_read_skip);
+	}
+	archive_read_set_read_callback(a, memory_read);
+	archive_read_set_close_callback(a, memory_read_close);
+	archive_read_set_callback_data(a, mine);
+	return archive_read_open1(a);
 }
 
 /*