Fix two tests on Solaris if compiling with -m64

diff --git a/libarchive/archive_read_support_format_xar.c b/libarchive/archive_read_support_format_xar.c
index 47ed064bc6273ce26883e6bf763c3e5c10af2a50..f00e1be70c11393638143b1d823585b9f5095e79 100644 (file)
--- a/libarchive/archive_read_support_format_xar.c
+++ b/libarchive/archive_read_support_format_xar.c
@@ -3047,7 +3047,7 @@ xml2_read_cb(void *context, char *buffer, int len)
        struct xar *xar;
        const void *d;
        size_t outbytes;
-       size_t used;
+       size_t used = 0;
        int r;
 
        a = (struct archive_read *)context;

diff --git a/tar/test/test_option_uid_uname.c b/tar/test/test_option_uid_uname.c
index 22be10f7c6fbf17a66bd05bb9f79d468ea3ebb8c..80c0619614882d3854f210452046317f3402851a 100644 (file)
--- a/tar/test/test_option_uid_uname.c
+++ b/tar/test/test_option_uid_uname.c
@@ -45,25 +45,25 @@ DEFINE_TEST(test_option_uid_uname)
        /* Again with both --uid and --uname */
        failure("Error invoking %s c", testprog);
        assertEqualInt(0,
-           systemf("%s cf archive2 --uid=18 --uname=foofoofoo --format=ustar file >stdout2.txt 2>stderr2.txt",
+           systemf("%s cf archive2 --uid=65123 --uname=foofoofoo --format=ustar file >stdout2.txt 2>stderr2.txt",
                testprog));
        assertEmptyFile("stdout2.txt");
        assertEmptyFile("stderr2.txt");
        data = slurpfile(&s, "archive2");
        /* Should force uid and uname fields in ustar header. */
-       assertEqualMem(data + 108, "000022 \0", 8);
+       assertEqualMem(data + 108, "177143 \0", 8);
        assertEqualMem(data + 265, "foofoofoo\0", 10);
        free(data);
 
        /* Again with just --uid */
        failure("Error invoking %s c", testprog);
        assertEqualInt(0,
-           systemf("%s cf archive3 --uid=18 --format=ustar file >stdout3.txt 2>stderr3.txt",
+           systemf("%s cf archive3 --uid=65123 --format=ustar file >stdout3.txt 2>stderr3.txt",
                testprog));
        assertEmptyFile("stdout3.txt");
        assertEmptyFile("stderr3.txt");
        data = slurpfile(&s, "archive3");
-       assertEqualMem(data + 108, "000022 \0", 8);
+       assertEqualMem(data + 108, "177143 \0", 8);
        /* Uname field in ustar header should be empty. */
        assertEqualMem(data + 265, "\0", 1);
        free(data);