assertEqualMem() should have always accepted void * arguments.

SVN-Revision: 1060

diff --git a/libarchive/test/main.c b/libarchive/test/main.c
index 1d7dee394ccfb25a33d92885df5271db9e04d128..c4a9721787d5ab5ae717e7da12c79f4c5086a868 100644 (file)
--- a/libarchive/test/main.c
+++ b/libarchive/test/main.c
@@ -463,13 +463,14 @@ hexdump(const char *p, const char *ref, size_t l, size_t offset)
 }
 
 /* assertEqualMem() displays the values of the two memory blocks. */
-/* TODO: For long blocks, hexdump the first bytes that actually differ. */
 int
 test_assert_equal_mem(const char *file, int line,
-    const char *v1, const char *e1,
-    const char *v2, const char *e2,
+    const void *_v1, const char *e1,
+    const void *_v2, const char *e2,
     size_t l, const char *ld, void *extra)
 {
+       const char *v1 = (const char *)_v1;
+       const char *v2 = (const char *)_v2;
        size_t offset;
 
        count_assertion(file, line);

diff --git a/libarchive/test/test.h b/libarchive/test/test.h
index 651274c5d615970b2bd33e1660d1f97443f8690f..0fcec4965cc67a05f36b0311de2992bec64e5288 100644 (file)
--- a/libarchive/test/test.h
+++ b/libarchive/test/test.h
@@ -147,7 +147,7 @@ int test_assert_equal_file(const char *, const char *, ...);
 int test_assert_equal_int(const char *, int, int, const char *, int, const char *, void *);
 int test_assert_equal_string(const char *, int, const char *v1, const char *, const char *v2, const char *, void *);
 int test_assert_equal_wstring(const char *, int, const wchar_t *v1, const char *, const wchar_t *v2, const char *, void *);
-int test_assert_equal_mem(const char *, int, const char *, const char *, const char *, const char *, size_t, const char *, void *);
+int test_assert_equal_mem(const char *, int, const void *, const char *, const void *, const char *, size_t, const char *, void *);
 int test_assert_file_contents(const void *, int, const char *, ...);
 int test_assert_file_exists(const char *, ...);
 int test_assert_file_not_exists(const char *, ...);