From 798abd9eaf3c9e8aa83c4dca28cdd44890253efe Mon Sep 17 00:00:00 2001 From: David Oberhollenzer Date: Thu, 25 Jul 2019 18:22:20 +0200 Subject: Rename table.c to write_table.c in accordance to function it contains Signed-off-by: David Oberhollenzer --- lib/Makemodule.am | 2 +- lib/sqfs/table.c | 61 -------------------------------------------------- lib/sqfs/write_table.c | 61 ++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 62 insertions(+), 62 deletions(-) delete mode 100644 lib/sqfs/table.c create mode 100644 lib/sqfs/write_table.c diff --git a/lib/Makemodule.am b/lib/Makemodule.am index 0ea95fa..2332a73 100644 --- a/lib/Makemodule.am +++ b/lib/Makemodule.am @@ -23,7 +23,7 @@ libcompress_a_CPPFLAGS = $(AM_CPPFLAGS) libsquashfs_a_SOURCES = include/meta_writer.h include/squashfs.h libsquashfs_a_SOURCES += lib/sqfs/meta_writer.c lib/sqfs/super.c libsquashfs_a_SOURCES += lib/sqfs/id_table.c include/id_table.h -libsquashfs_a_SOURCES += lib/sqfs/table.c include/highlevel.h +libsquashfs_a_SOURCES += lib/sqfs/write_table.c include/highlevel.h libsquashfs_a_SOURCES += lib/sqfs/read_super.c lib/sqfs/meta_reader.c libsquashfs_a_SOURCES += include/meta_reader.h lib/sqfs/id_table_write.c libsquashfs_a_SOURCES += lib/sqfs/id_table_read.c lib/sqfs/read_inode.c diff --git a/lib/sqfs/table.c b/lib/sqfs/table.c deleted file mode 100644 index fc90a3f..0000000 --- a/lib/sqfs/table.c +++ /dev/null @@ -1,61 +0,0 @@ -/* SPDX-License-Identifier: GPL-3.0-or-later */ -#include "config.h" - -#include "meta_writer.h" -#include "highlevel.h" -#include "util.h" - -#include -#include - -int sqfs_write_table(int outfd, sqfs_super_t *super, const void *data, - size_t entsize, size_t count, uint64_t *startblock, - compressor_t *cmp) -{ - size_t ent_per_blocks = SQFS_META_BLOCK_SIZE / entsize; - uint64_t blocks[count / ent_per_blocks + 1], block; - size_t i, blkidx = 0, tblsize; - meta_writer_t *m; - uint32_t offset; - - /* Write actual data. Whenever we cross a block boundary, remember - the block start offset */ - m = meta_writer_create(outfd, cmp, false); - if (m == NULL) - return -1; - - for (i = 0; i < count; ++i) { - meta_writer_get_position(m, &block, &offset); - - if (blkidx == 0 || block > blocks[blkidx - 1]) - blocks[blkidx++] = block; - - if (meta_writer_append(m, data, entsize)) - goto fail; - - data = (const char *)data + entsize; - } - - if (meta_writer_flush(m)) - goto fail; - - for (i = 0; i < blkidx; ++i) - blocks[i] = htole64(blocks[i] + super->bytes_used); - - meta_writer_get_position(m, &block, &offset); - super->bytes_used += block; - meta_writer_destroy(m); - - /* write new index table */ - *startblock = super->bytes_used; - tblsize = sizeof(blocks[0]) * blkidx; - - if (write_data("writing table index", outfd, blocks, tblsize)) - return -1; - - super->bytes_used += tblsize; - return 0; -fail: - meta_writer_destroy(m); - return -1; -} diff --git a/lib/sqfs/write_table.c b/lib/sqfs/write_table.c new file mode 100644 index 0000000..fc90a3f --- /dev/null +++ b/lib/sqfs/write_table.c @@ -0,0 +1,61 @@ +/* SPDX-License-Identifier: GPL-3.0-or-later */ +#include "config.h" + +#include "meta_writer.h" +#include "highlevel.h" +#include "util.h" + +#include +#include + +int sqfs_write_table(int outfd, sqfs_super_t *super, const void *data, + size_t entsize, size_t count, uint64_t *startblock, + compressor_t *cmp) +{ + size_t ent_per_blocks = SQFS_META_BLOCK_SIZE / entsize; + uint64_t blocks[count / ent_per_blocks + 1], block; + size_t i, blkidx = 0, tblsize; + meta_writer_t *m; + uint32_t offset; + + /* Write actual data. Whenever we cross a block boundary, remember + the block start offset */ + m = meta_writer_create(outfd, cmp, false); + if (m == NULL) + return -1; + + for (i = 0; i < count; ++i) { + meta_writer_get_position(m, &block, &offset); + + if (blkidx == 0 || block > blocks[blkidx - 1]) + blocks[blkidx++] = block; + + if (meta_writer_append(m, data, entsize)) + goto fail; + + data = (const char *)data + entsize; + } + + if (meta_writer_flush(m)) + goto fail; + + for (i = 0; i < blkidx; ++i) + blocks[i] = htole64(blocks[i] + super->bytes_used); + + meta_writer_get_position(m, &block, &offset); + super->bytes_used += block; + meta_writer_destroy(m); + + /* write new index table */ + *startblock = super->bytes_used; + tblsize = sizeof(blocks[0]) * blkidx; + + if (write_data("writing table index", outfd, blocks, tblsize)) + return -1; + + super->bytes_used += tblsize; + return 0; +fail: + meta_writer_destroy(m); + return -1; +} -- cgit v1.2.3