From 92e2c77a5b5eeabc3252ea90953ab6bd1a8944d1 Mon Sep 17 00:00:00 2001 From: David Oberhollenzer Date: Wed, 8 Feb 2023 14:08:34 +0100 Subject: libtar: remove need for skip_padding function In the istream implementation, automatically skip the padding when we reach end-of-file. Also skip file AND padding when we destroy the object. Replace the remaining instances with a simple istream_skip instead and remove the wrapper from libtar. Signed-off-by: David Oberhollenzer --- lib/tar/test/tar_istream2.c | 4 ---- lib/tar/test/tar_target_filled.c | 4 ++-- 2 files changed, 2 insertions(+), 6 deletions(-) (limited to 'lib/tar/test') diff --git a/lib/tar/test/tar_istream2.c b/lib/tar/test/tar_istream2.c index a3f27d5..e5cdca8 100644 --- a/lib/tar/test/tar_istream2.c +++ b/lib/tar/test/tar_istream2.c @@ -77,8 +77,6 @@ int main(int argc, char **argv) ti = sqfs_drop(ti); TEST_EQUAL_UI(((sqfs_object_t *)fp)->refcount, 1); - TEST_ASSERT(skip_padding(fp, 5) == 0); - TEST_EQUAL_UI(((sqfs_object_t *)fp)->refcount, 1); TEST_ASSERT(read_header(fp, &hdr) == 0); TEST_EQUAL_UI(((sqfs_object_t *)fp)->refcount, 1); @@ -102,8 +100,6 @@ int main(int argc, char **argv) ti = sqfs_drop(ti); TEST_EQUAL_UI(((sqfs_object_t *)fp)->refcount, 1); - TEST_ASSERT(skip_padding(fp, 5) == 0); - /* "deep" directory hierarchy containg a hard link */ TEST_EQUAL_UI(((sqfs_object_t *)fp)->refcount, 1); TEST_ASSERT(read_header(fp, &hdr) == 0); diff --git a/lib/tar/test/tar_target_filled.c b/lib/tar/test/tar_target_filled.c index abc6a47..e2e1798 100644 --- a/lib/tar/test/tar_target_filled.c +++ b/lib/tar/test/tar_target_filled.c @@ -53,7 +53,7 @@ int main(int argc, char **argv) TEST_ASSERT(istream_read(fp, buffer, 5) == 5); buffer[5] = '\0'; TEST_STR_EQUAL(buffer, "test\n"); - TEST_ASSERT(skip_padding(fp, 5) == 0); + TEST_ASSERT(istream_skip(fp, 512 - 5) == 0); clear_header(&hdr); TEST_ASSERT(read_header(fp, &hdr) == 0); @@ -65,7 +65,7 @@ int main(int argc, char **argv) TEST_ASSERT(istream_read(fp, buffer, 5) == 5); buffer[5] = '\0'; TEST_STR_EQUAL(buffer, "test\n"); - TEST_ASSERT(skip_padding(fp, 5) == 0); + TEST_ASSERT(istream_skip(fp, 512 - 5) == 0); clear_header(&hdr); /* "deep" directory hierarchy containg a hard link */ -- cgit v1.2.3