aboutsummaryrefslogtreecommitdiff
path: root/bin/gensquashfs
diff options
context:
space:
mode:
authorDavid Oberhollenzer <david.oberhollenzer@sigma-star.at>2023-06-05 19:15:13 +0200
committerDavid Oberhollenzer <david.oberhollenzer@sigma-star.at>2023-06-05 16:22:00 +0200
commit2d3cb9c4323a803268206db3a9363abc67d908d0 (patch)
treeebf126a48931b46f5d76c42818754dbf054c68b5 /bin/gensquashfs
parentc9a8adc15f9de110771156fdc85fb98533648a53 (diff)
libsqfs: Add an xattr writer function to add a combined key-value struct
Signed-off-by: David Oberhollenzer <david.oberhollenzer@sigma-star.at>
Diffstat (limited to 'bin/gensquashfs')
-rw-r--r--bin/gensquashfs/src/dirscan_xattr.c2
-rw-r--r--bin/gensquashfs/src/filemap_xattr.c2
-rw-r--r--bin/gensquashfs/src/selinux.c4
3 files changed, 4 insertions, 4 deletions
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)