From c9a8adc15f9de110771156fdc85fb98533648a53 Mon Sep 17 00:00:00 2001 From: David Oberhollenzer Date: Mon, 5 Jun 2023 19:06:42 +0200 Subject: Move dir_entry_xattr_t from libio to libsquashfs The structure and functions are renamed to sqfs_xattr_* instead, an additional helper is added to accept an encoded xattr. Documentation and unit test are added as well. Signed-off-by: David Oberhollenzer --- lib/tar/src/iterator.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'lib/tar/src/iterator.c') diff --git a/lib/tar/src/iterator.c b/lib/tar/src/iterator.c index b1be42d..216c528 100644 --- a/lib/tar/src/iterator.c +++ b/lib/tar/src/iterator.c @@ -6,6 +6,7 @@ */ #include "tar/tar.h" #include "sqfs/error.h" +#include "sqfs/xattr.h" #include "util/util.h" #include @@ -281,7 +282,7 @@ static int it_open_file_ro(dir_iterator_t *it, istream_t **out) return 0; } -static int it_read_xattr(dir_iterator_t *it, dir_entry_xattr_t **out) +static int it_read_xattr(dir_iterator_t *it, sqfs_xattr_t **out) { tar_iterator_t *tar = (tar_iterator_t *)it; @@ -293,7 +294,7 @@ static int it_read_xattr(dir_iterator_t *it, dir_entry_xattr_t **out) return tar->state < 0 ? tar->state : SQFS_ERROR_NO_ENTRY; if (tar->current.xattr != NULL) { - *out = dir_entry_xattr_list_copy(tar->current.xattr); + *out = sqfs_xattr_list_copy(tar->current.xattr); if (*out == NULL) return SQFS_ERROR_ALLOC; } -- cgit v1.2.3