diff options
-rw-r--r-- | libarchive/test/test_xattr_platform.c | 6 | ||||
-rw-r--r-- | tar/test/test_option_acls.c | 4 | ||||
-rw-r--r-- | tar/test/test_option_xattrs.c | 3 | ||||
-rw-r--r-- | test_utils/test_common.h | 2 | ||||
-rw-r--r-- | test_utils/test_main.c | 4 |
5 files changed, 12 insertions, 7 deletions
diff --git a/libarchive/test/test_xattr_platform.c b/libarchive/test/test_xattr_platform.c index ebb265ed..df3f81a5 100644 --- a/libarchive/test/test_xattr_platform.c +++ b/libarchive/test/test_xattr_platform.c @@ -35,6 +35,7 @@ DEFINE_TEST(test_xattr_platform) struct archive_entry *ae; const char *name; const void *value; + void *rvalue; size_t size, insize; int e, r; const char *attrname = "user.libarchive.test"; @@ -95,8 +96,9 @@ DEFINE_TEST(test_xattr_platform) assertEqualIntA(a, ARCHIVE_OK, archive_write_close(a)); assertEqualInt(ARCHIVE_OK, archive_write_free(a)); - value = getXattr("writetest", attrname, &insize); + rvalue = getXattr("writetest", attrname, &insize); if (assertEqualInt(insize, strlen(writeval) + 1) != 0) - assertEqualMem(value, writeval, insize); + assertEqualMem(rvalue, writeval, insize); + free(rvalue); #endif } diff --git a/tar/test/test_option_acls.c b/tar/test/test_option_acls.c index be0db449..f2d51d66 100644 --- a/tar/test/test_option_acls.c +++ b/tar/test/test_option_acls.c @@ -360,8 +360,10 @@ compare_acls(const char *path_a, const char *path_b) if (richacl_a != NULL) { richacl_b = richacl_get_file(path_b); if (richacl_b == NULL && - (errno == ENODATA || errno == ENOTSUP || errno == ENOSYS)) + (errno == ENODATA || errno == ENOTSUP || errno == ENOSYS)) { + richacl_free(richacl_a); return (0); + } failure("richacl_get_file() error: %s (%s)", path_b, strerror(errno)); if (assert(richacl_b != NULL) == 0) { diff --git a/tar/test/test_option_xattrs.c b/tar/test/test_option_xattrs.c index 5095ce33..bce8a94e 100644 --- a/tar/test/test_option_xattrs.c +++ b/tar/test/test_option_xattrs.c @@ -33,7 +33,7 @@ DEFINE_TEST(test_option_xattrs) const char *testattr = "user.libarchive.test"; const char *testval = "testval"; - const void *readval; + void *readval; size_t size; int r; @@ -62,6 +62,7 @@ DEFINE_TEST(test_option_xattrs) readval = getXattr("xattrs_xattrs/f", testattr, &size); if(assertEqualInt(size, strlen(testval) + 1) != 0) assertEqualMem(readval, testval, size); + free(readval); /* Extract xattrs without xattrs */ assertMakeDir("xattrs_noxattrs", 0755); diff --git a/test_utils/test_common.h b/test_utils/test_common.h index fa726bff..1425dd84 100644 --- a/test_utils/test_common.h +++ b/test_utils/test_common.h @@ -348,7 +348,7 @@ int canNodump(void); int setTestAcl(const char *path); /* Get extended attribute */ -const void *getXattr(const char *, const char *, size_t *); +void *getXattr(const char *, const char *, size_t *); /* Set extended attribute */ int setXattr(const char *, const char *, const void *, size_t); diff --git a/test_utils/test_main.c b/test_utils/test_main.c index 36dfc82f..d7404593 100644 --- a/test_utils/test_main.c +++ b/test_utils/test_main.c @@ -2451,8 +2451,8 @@ canNodump(void) return (0); } -/* Get extended attribute from a path */ -const void * +/* Get extended attribute value from a path */ +void * getXattr(const char *path, const char *name, size_t *sizep) { void *value = NULL; |