leandrof/u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fs/squashfs: simplify sqfs_read()

Browse Source 
* Don't check argument of free(). Free does this itself.
* Reduce scope of data_buffer. Remove duplicate free().
* Avoid superfluous NULL assignment.

Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt@canonical.com>
Reviewed-by: Miquel Raynal <miquel.raynal@bootlin.com>
This commit is contained in:
Heinrich Schuchardt 2022-04-11 22:54:44 +02:00 committed by Tom Rini
parent 7ffc66e7db
commit 9bd89bbd71
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
fs/squashfs/sqfs.c
View File

@ -1310,7 +1310,7 @@ static int sqfs_get_lregfile_info(struct squashfs_lreg_inode *lreg,
int sqfs_read(const char *filename, void *buf, loff_t offset, loff_t len, int sqfs_read(const char *filename, void *buf, loff_t offset, loff_t len,
loff_t *actread) loff_t *actread)
{ {
char *dir = NULL, *fragment_block, *datablock = NULL, *data_buffer = NULL; char *dir = NULL, *fragment_block, *datablock = NULL;
char *fragment = NULL, *file = NULL, *resolved, *data; char *fragment = NULL, *file = NULL, *resolved, *data;
u64 start, n_blks, table_size, data_offset, table_offset, sparse_size; u64 start, n_blks, table_size, data_offset, table_offset, sparse_size;
int ret, j, i_number, datablk_count = 0; int ret, j, i_number, datablk_count = 0;
@ -1440,6 +1440,8 @@ int sqfs_read(const char *filename, void *buf, loff_t offset, loff_t len,
} }
for (j = 0; j < datablk_count; j++) { for (j = 0; j < datablk_count; j++) {
char *data_buffer;
start = data_offset / ctxt.cur_dev->blksz; start = data_offset / ctxt.cur_dev->blksz;
table_size = SQFS_BLOCK_SIZE(finfo.blk_sizes[j]); table_size = SQFS_BLOCK_SIZE(finfo.blk_sizes[j]);
table_offset = data_offset - (start * ctxt.cur_dev->blksz); table_offset = data_offset - (start * ctxt.cur_dev->blksz);
@ -1501,9 +1503,7 @@ int sqfs_read(const char *filename, void *buf, loff_t offset, loff_t len,
} }
data_offset += table_size; data_offset += table_size;
if (data_buffer) free(data_buffer);
free(data_buffer);
data_buffer = NULL;
if (*actread >= len) if (*actread >= len)
break; break;
} }
@ -1563,10 +1563,7 @@ int sqfs_read(const char *filename, void *buf, loff_t offset, loff_t len,
out: out:
free(fragment); free(fragment);
if (datablk_count) { free(datablock);
free(data_buffer);
free(datablock);
}
free(file); free(file);
free(dir); free(dir);
free(finfo.blk_sizes); free(finfo.blk_sizes);