From 2d3cb9c4323a803268206db3a9363abc67d908d0 Mon Sep 17 00:00:00 2001 From: David Oberhollenzer Date: Mon, 5 Jun 2023 19:15:13 +0200 Subject: libsqfs: Add an xattr writer function to add a combined key-value struct Signed-off-by: David Oberhollenzer --- bin/gensquashfs/src/dirscan_xattr.c | 2 +- bin/gensquashfs/src/filemap_xattr.c | 2 +- bin/gensquashfs/src/selinux.c | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'bin/gensquashfs/src') diff --git a/bin/gensquashfs/src/dirscan_xattr.c b/bin/gensquashfs/src/dirscan_xattr.c index e39a868..1bc829f 100644 --- a/bin/gensquashfs/src/dirscan_xattr.c +++ b/bin/gensquashfs/src/dirscan_xattr.c @@ -95,7 +95,7 @@ static int xattr_from_path(sqfs_xattr_writer_t *xwr, const char *path) goto fail; } - ret = sqfs_xattr_writer_add(xwr, key, value, vallen); + ret = sqfs_xattr_writer_add_kv(xwr, key, value, vallen); if (ret) { sqfs_perror(path, "storing xattr key-value pairs", diff --git a/bin/gensquashfs/src/filemap_xattr.c b/bin/gensquashfs/src/filemap_xattr.c index 0870d3b..508e75a 100644 --- a/bin/gensquashfs/src/filemap_xattr.c +++ b/bin/gensquashfs/src/filemap_xattr.c @@ -240,7 +240,7 @@ xattr_apply_map_file(char *path, void *map, sqfs_xattr_writer_t *xwr) { printf(" %s = \n", entry->key); fwrite(entry->value, entry->value_len, 1, stdout); puts("\n"); - ret = sqfs_xattr_writer_add( + ret = sqfs_xattr_writer_add_kv( xwr, entry->key, entry->value, entry->value_len); if (ret < 0) { return ret; diff --git a/bin/gensquashfs/src/selinux.c b/bin/gensquashfs/src/selinux.c index 678723b..24fba54 100644 --- a/bin/gensquashfs/src/selinux.c +++ b/bin/gensquashfs/src/selinux.c @@ -22,8 +22,8 @@ int selinux_relable_node(void *sehnd, sqfs_xattr_writer_t *xwr, goto fail; } - ret = sqfs_xattr_writer_add(xwr, XATTR_NAME_SELINUX, - context, strlen(context)); + ret = sqfs_xattr_writer_add_kv(xwr, XATTR_NAME_SELINUX, + context, strlen(context)); free(context); if (ret) -- cgit v1.2.3