diff options
| author | David Oberhollenzer <david.oberhollenzer@sigma-star.at> | 2019-09-14 01:41:38 +0200 |
|---|---|---|
| committer | David Oberhollenzer <david.oberhollenzer@sigma-star.at> | 2019-09-14 04:10:45 +0200 |
| commit | f57814332a69bebc40e25e6537a3c08fc9e18f97 (patch) | |
| tree | 7ff880b8eb53f4852c6f0be9436f220643219795 /lib/sqfshelper/data_reader.c | |
| parent | d455ff92da0249e731cff7613f42b0f7359775da (diff) | |
Move data deduplication from fstree code to data writer
Signed-off-by: David Oberhollenzer <david.oberhollenzer@sigma-star.at>
Diffstat (limited to 'lib/sqfshelper/data_reader.c')
| -rw-r--r-- | lib/sqfshelper/data_reader.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/lib/sqfshelper/data_reader.c b/lib/sqfshelper/data_reader.c index d1a9cce..6906933 100644 --- a/lib/sqfshelper/data_reader.c +++ b/lib/sqfshelper/data_reader.c @@ -193,7 +193,7 @@ int data_reader_dump_file(data_reader_t *data, file_info_t *fi, int outfd, diff = filesz > data->block_size ? data->block_size : filesz; filesz -= diff; - if (SQFS_IS_SPARSE_BLOCK(fi->blocks[i].size)) { + if (SQFS_IS_SPARSE_BLOCK(fi->block_size[i])) { if (allow_sparse) { if (lseek(outfd, diff, SEEK_CUR) == (off_t)-1) goto fail_sparse; @@ -201,9 +201,9 @@ int data_reader_dump_file(data_reader_t *data, file_info_t *fi, int outfd, } memset(data->block, 0, diff); } else { - if (precache_data_block(data, off, fi->blocks[i].size)) + if (precache_data_block(data, off, fi->block_size[i])) return -1; - off += SQFS_ON_DISK_BLOCK_SIZE(fi->blocks[i].size); + off += SQFS_ON_DISK_BLOCK_SIZE(fi->block_size[i]); } if (write_data("writing uncompressed block", @@ -259,7 +259,7 @@ ssize_t data_reader_read(data_reader_t *data, file_info_t *fi, i = 0; while (offset > data->block_size && i < count) { - off += SQFS_ON_DISK_BLOCK_SIZE(fi->blocks[i++].size); + off += SQFS_ON_DISK_BLOCK_SIZE(fi->block_size[i++]); offset -= data->block_size; } @@ -269,14 +269,14 @@ ssize_t data_reader_read(data_reader_t *data, file_info_t *fi, if (size < diff) size = diff; - if (SQFS_IS_SPARSE_BLOCK(fi->blocks[i].size)) { + if (SQFS_IS_SPARSE_BLOCK(fi->block_size[i])) { memset(buffer, 0, diff); } else { - if (precache_data_block(data, off, fi->blocks[i].size)) + if (precache_data_block(data, off, fi->block_size[i])) return -1; memcpy(buffer, (char *)data->block + offset, diff); - off += SQFS_ON_DISK_BLOCK_SIZE(fi->blocks[i].size); + off += SQFS_ON_DISK_BLOCK_SIZE(fi->block_size[i]); } ++i; |