From eb9a4b9034453ae3093d678a6f3898303dc5a5a0 Mon Sep 17 00:00:00 2001 From: David Oberhollenzer Date: Mon, 12 Jun 2023 18:32:12 +0200 Subject: libio: remove ostream_append_sparse and fallback implementation Instead of a separate append-sparse function, simply accept NULL as an input for append. For both Unix and Win32, a fallback needs to be implemented. For XFRM, we can just memset the input buffer to zero, same for the libsquashfs data writer. Signed-off-by: David Oberhollenzer --- lib/io/test/sparse_fb.c | 66 ------------------------------------------------- lib/io/test/xfrm.c | 10 +++++--- 2 files changed, 6 insertions(+), 70 deletions(-) delete mode 100644 lib/io/test/sparse_fb.c (limited to 'lib/io/test') diff --git a/lib/io/test/sparse_fb.c b/lib/io/test/sparse_fb.c deleted file mode 100644 index 5ee6004..0000000 --- a/lib/io/test/sparse_fb.c +++ /dev/null @@ -1,66 +0,0 @@ -/* SPDX-License-Identifier: GPL-3.0-or-later */ -/* - * get_line.c - * - * Copyright (C) 2019 David Oberhollenzer - */ -#include "config.h" - -#include "io/ostream.h" -#include "util/test.h" -#include "util/util.h" - -static ostream_t dummy; -static size_t total = 0; - -static int dummy_append(ostream_t *strm, const void *data, size_t size) -{ - bool bret; - - TEST_ASSERT(strm == &dummy); - TEST_NOT_NULL(data); - TEST_ASSERT(size > 0); - - bret = is_memory_zero(data, size); - TEST_ASSERT(bret); - - bret = SZ_ADD_OV(total, size, &total); - TEST_ASSERT(!bret); - return 0; -} - -static int dummy_flush(ostream_t *strm) -{ - TEST_ASSERT(strm == &dummy); - return 0; -} - -static ostream_t dummy = { - { - 1, - NULL, - NULL, - }, - dummy_append, - NULL, - dummy_flush, - NULL, -}; - -int main(int argc, char **argv) -{ - size_t ref; - int ret; - (void)argc; (void)argv; - - ref = 131072 + 1337; - - ret = ostream_append_sparse(&dummy, ref); - TEST_EQUAL_I(ret, 0); - - ret = dummy.flush(&dummy); - TEST_EQUAL_I(ret, 0); - - TEST_EQUAL_UI(ref, total); - return EXIT_SUCCESS; -} diff --git a/lib/io/test/xfrm.c b/lib/io/test/xfrm.c index c2e450c..184db9e 100644 --- a/lib/io/test/xfrm.c +++ b/lib/io/test/xfrm.c @@ -374,7 +374,6 @@ static int mem_flush(ostream_t *strm); static ostream_t mem_ostream = { { 1, NULL, NULL, }, mem_append, - NULL, mem_flush, NULL, }; @@ -382,15 +381,18 @@ static ostream_t mem_ostream = { static int mem_append(ostream_t *strm, const void *data, size_t size) { TEST_ASSERT(strm == &mem_ostream); - TEST_NOT_NULL(data); TEST_ASSERT(size > 0); TEST_ASSERT(mo_written <= sizeof(mo_buffer)); TEST_ASSERT(size <= (sizeof(mo_buffer) - mo_written)); - memcpy(mo_buffer + mo_written, data, size); - mo_written += size; + if (data == NULL) { + memset(mo_buffer + mo_written, 0, size); + } else { + memcpy(mo_buffer + mo_written, data, size); + } + mo_written += size; return 0; } -- cgit v1.2.3