Fix libarchive tests to work correctly with the candidate 3.0 API.

SVN-Revision: 1949

diff --git a/libarchive/test/test_read_disk.c b/libarchive/test/test_read_disk.c
index b93ef87acac98ec009d7a51c77d1c125ebe2d86e..f3afe7eca73905c675dfef277cd37e7411ec4072 100644 (file)
--- a/libarchive/test/test_read_disk.c
+++ b/libarchive/test/test_read_disk.c
@@ -33,8 +33,13 @@ gname_cleanup(void *d)
        *mp = 0x2468;
 }
 
+#if ARCHIVE_VERSION_NUMBER < 3000000
 static const char *
 gname_lookup(void *d, gid_t g)
+#else
+static const char *
+gname_lookup(void *d, int64_t g)
+#endif
 {
        int *mp = d;
        assertEqualInt(*mp, 0x13579);
@@ -51,8 +56,13 @@ uname_cleanup(void *d)
        *mp = 0x2345;
 }
 
+#if ARCHIVE_VERSION_NUMBER < 3000000
 static const char *
 uname_lookup(void *d, uid_t u)
+#else
+static const char *
+uname_lookup(void *d, int64_t u)
+#endif
 {
        int *mp = d;
        assertEqualInt(*mp, 0x1234);

diff --git a/libarchive/test/test_read_disk_entry_from_file.c b/libarchive/test/test_read_disk_entry_from_file.c
index 9fe358dce5ebcd96c4a92d7335489437719c90e2..471c466b68b1cfb4aaf7253c77165368b1e7c114 100644 (file)
--- a/libarchive/test/test_read_disk_entry_from_file.c
+++ b/libarchive/test/test_read_disk_entry_from_file.c
@@ -25,16 +25,26 @@
 #include "test.h"
 __FBSDID("$FreeBSD: head/lib/libarchive/test/test_read_disk_entry_from_file.c 201247 2009-12-30 05:59:21Z kientzle $");
 
+#if ARCHIVE_VERSION_NUMBER < 3000000
 static const char *
 gname_lookup(void *d, gid_t g)
+#else
+static const char *
+gname_lookup(void *d, int64_t g)
+#endif
 {
        (void)d; /* UNUSED */
        (void)g; /* UNUSED */
        return ("FOOGROUP");
 }
 
+#if ARCHIVE_VERSION_NUMBER < 3000000
 static const char *
 uname_lookup(void *d, uid_t u)
+#else
+static const char *
+uname_lookup(void *d, int64_t u)
+#endif
 {
        (void)d; /* UNUSED */
        (void)u; /* UNUSED */