diff options
author | David Oberhollenzer <david.oberhollenzer@sigma-star.at> | 2019-11-06 12:08:08 +0100 |
---|---|---|
committer | David Oberhollenzer <david.oberhollenzer@sigma-star.at> | 2019-11-06 12:08:08 +0100 |
commit | 2c49bf4fca54e9acb47844878cc43617ce2a1422 (patch) | |
tree | d58700d8dd10d77ad93883478a35e172fd3ca95f | |
parent | 4548e0f202e7fc3d2e9cd8de98670c64711353d5 (diff) |
Cleanup: remove unused stdout sqfs_file_t wrapper
Signed-off-by: David Oberhollenzer <david.oberhollenzer@sigma-star.at>
-rw-r--r-- | include/common.h | 2 | ||||
-rw-r--r-- | lib/common/io_stdin.c | 79 |
2 files changed, 0 insertions, 81 deletions
diff --git a/include/common.h b/include/common.h index da9093f..676dd6a 100644 --- a/include/common.h +++ b/include/common.h @@ -122,8 +122,6 @@ int sqfs_data_reader_dump(const char *name, sqfs_data_reader_t *data, sqfs_file_t *sqfs_get_stdin_file(const sparse_map_t *map, sqfs_u64 size); -sqfs_file_t *sqfs_get_stdout_file(void); - void register_stat_hooks(sqfs_data_writer_t *data, data_writer_stats_t *stats); int write_data_from_file(const char *filename, sqfs_data_writer_t *data, diff --git a/lib/common/io_stdin.c b/lib/common/io_stdin.c index ea73771..dbdea5f 100644 --- a/lib/common/io_stdin.c +++ b/lib/common/io_stdin.c @@ -37,8 +37,6 @@ static int stdinout_truncate(sqfs_file_t *base, sqfs_u64 size) return SQFS_ERROR_IO; } -/*****************************************************************************/ - static int stdin_read_at(sqfs_file_t *base, sqfs_u64 offset, void *buffer, size_t size) { @@ -148,66 +146,6 @@ static int stdin_write_at(sqfs_file_t *base, sqfs_u64 offset, return SQFS_ERROR_IO; } -/*****************************************************************************/ - -static int stdout_read_at(sqfs_file_t *base, sqfs_u64 offset, - void *buffer, size_t size) -{ - (void)base; (void)offset; (void)buffer; (void)size; - return SQFS_ERROR_IO; -} - -static int stdout_write_at(sqfs_file_t *base, sqfs_u64 offset, - const void *buffer, size_t size) -{ - sqfs_file_stdinout_t *file = (sqfs_file_stdinout_t *)base; - size_t temp_size = 0; - sqfs_u8 *temp = NULL; - sqfs_u64 diff; - ssize_t ret; - - if (offset < file->size) - return SQFS_ERROR_IO; - - if (offset > file->size) { - temp_size = 1024; - temp = alloca(temp_size); - memset(temp, 0, temp_size); - } - - while (size > 0) { - if (offset > file->size) { - diff = offset - file->size; - diff = diff > (sqfs_u64)temp_size ? temp_size : diff; - - ret = write(STDOUT_FILENO, temp, diff); - } else { - ret = write(STDOUT_FILENO, buffer, size); - } - - if (ret < 0) { - if (errno == EINTR) - continue; - return SQFS_ERROR_IO; - } - - if (ret == 0) - return SQFS_ERROR_OUT_OF_BOUNDS; - - if (offset <= file->size) { - buffer = (char *)buffer + ret; - size -= ret; - offset += ret; - } - - file->size += ret; - } - - return 0; -} - -/*****************************************************************************/ - sqfs_file_t *sqfs_get_stdin_file(const sparse_map_t *map, sqfs_u64 size) { sqfs_file_stdinout_t *file = calloc(1, sizeof(*file)); @@ -231,20 +169,3 @@ sqfs_file_t *sqfs_get_stdin_file(const sparse_map_t *map, sqfs_u64 size) } return base; } - -sqfs_file_t *sqfs_get_stdout_file(void) -{ - sqfs_file_stdinout_t *file = calloc(1, sizeof(*file)); - sqfs_file_t *base = (sqfs_file_t *)file; - - if (file == NULL) - return NULL; - - base->destroy = stdinout_destroy; - base->write_at = stdout_write_at; - base->get_size = stdinout_get_size; - base->truncate = stdinout_truncate; - base->read_at = stdout_read_at; - - return base; -} |