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 --- lib/sqfs/test/xattr_benchmark.c | 4 ++-- lib/sqfs/test/xattr_writer.c | 20 ++++++++++---------- 2 files changed, 12 insertions(+), 12 deletions(-) (limited to 'lib/sqfs/test') diff --git a/lib/sqfs/test/xattr_benchmark.c b/lib/sqfs/test/xattr_benchmark.c index 072dd06..eab759a 100644 --- a/lib/sqfs/test/xattr_benchmark.c +++ b/lib/sqfs/test/xattr_benchmark.c @@ -96,8 +96,8 @@ int main(int argc, char **argv) snprintf(value, sizeof(value), "group%ld/value%ld", blkidx, grpidx); - ret = sqfs_xattr_writer_add(xwr, key, value, - strlen(value)); + ret = sqfs_xattr_writer_add_kv(xwr, key, value, + strlen(value)); if (ret < 0) { sqfs_perror(NULL, "add to xattr block", ret); diff --git a/lib/sqfs/test/xattr_writer.c b/lib/sqfs/test/xattr_writer.c index f7d0734..55d2030 100644 --- a/lib/sqfs/test/xattr_writer.c +++ b/lib/sqfs/test/xattr_writer.c @@ -95,10 +95,10 @@ int main(int argc, char **argv) ret = sqfs_xattr_writer_begin(xwr, 0); TEST_EQUAL_I(ret, 0); - ret = sqfs_xattr_writer_add(xwr, "user.foobar", "test", 4); + ret = sqfs_xattr_writer_add_kv(xwr, "user.foobar", "test", 4); TEST_EQUAL_I(ret, 0); - ret = sqfs_xattr_writer_add(xwr, "security.selinux", "Xwhatever", 9); + ret = sqfs_xattr_writer_add_kv(xwr, "security.selinux", "Xwhatever", 9); TEST_EQUAL_I(ret, 0); ret = sqfs_xattr_writer_end(xwr, &id); @@ -109,10 +109,10 @@ int main(int argc, char **argv) ret = sqfs_xattr_writer_begin(xwr, 0); TEST_EQUAL_I(ret, 0); - ret = sqfs_xattr_writer_add(xwr, "user.foobar", "bla", 3); + ret = sqfs_xattr_writer_add_kv(xwr, "user.foobar", "bla", 3); TEST_EQUAL_I(ret, 0); - ret = sqfs_xattr_writer_add(xwr, "security.selinux", "blub", 4); + ret = sqfs_xattr_writer_add_kv(xwr, "security.selinux", "blub", 4); TEST_EQUAL_I(ret, 0); ret = sqfs_xattr_writer_end(xwr, &id); @@ -123,10 +123,10 @@ int main(int argc, char **argv) ret = sqfs_xattr_writer_begin(xwr, 0); TEST_EQUAL_I(ret, 0); - ret = sqfs_xattr_writer_add(xwr, "security.selinux", "Xwhatever", 9); + ret = sqfs_xattr_writer_add_kv(xwr, "security.selinux", "Xwhatever", 9); TEST_EQUAL_I(ret, 0); - ret = sqfs_xattr_writer_add(xwr, "user.foobar", "test", 4); + ret = sqfs_xattr_writer_add_kv(xwr, "user.foobar", "test", 4); TEST_EQUAL_I(ret, 0); ret = sqfs_xattr_writer_end(xwr, &id); @@ -138,13 +138,13 @@ int main(int argc, char **argv) ret = sqfs_xattr_writer_begin(xwr, 0); TEST_EQUAL_I(ret, 0); - ret = sqfs_xattr_writer_add(xwr, "user.foobar", "mimimi", 6); + ret = sqfs_xattr_writer_add_kv(xwr, "user.foobar", "mimimi", 6); TEST_EQUAL_I(ret, 0); - ret = sqfs_xattr_writer_add(xwr, "security.selinux", "blub", 4); + ret = sqfs_xattr_writer_add_kv(xwr, "security.selinux", "blub", 4); TEST_EQUAL_I(ret, 0); - ret = sqfs_xattr_writer_add(xwr, "user.foobar", "bla", 3); + ret = sqfs_xattr_writer_add_kv(xwr, "user.foobar", "bla", 3); TEST_EQUAL_I(ret, 0); ret = sqfs_xattr_writer_end(xwr, &id); @@ -155,7 +155,7 @@ int main(int argc, char **argv) ret = sqfs_xattr_writer_begin(xwr, 0); TEST_EQUAL_I(ret, 0); - ret = sqfs_xattr_writer_add(xwr, "security.selinux", "Xwhatever", 9); + ret = sqfs_xattr_writer_add_kv(xwr, "security.selinux", "Xwhatever", 9); TEST_EQUAL_I(ret, 0); ret = sqfs_xattr_writer_end(xwr, &id); -- cgit v1.2.3