diff options
| author | David Oberhollenzer <david.oberhollenzer@sigma-star.at> | 2022-06-02 21:20:37 +0200 |
|---|---|---|
| committer | David Oberhollenzer <david.oberhollenzer@sigma-star.at> | 2022-06-02 21:20:37 +0200 |
| commit | 9ae7e11098d0a3bbbae970b2c0457a39bddb174c (patch) | |
| tree | 6224a2065b5dfb95ee6303e3a91839be71bf38a6 | |
| parent | 9d474f278d21ddc452d8a1a722b3735fae94115c (diff) | |
Cleanup: libsqfs: simplify state handling in dir reader
Signed-off-by: David Oberhollenzer <david.oberhollenzer@sigma-star.at>
| -rw-r--r-- | lib/sqfs/dir_reader/dir_reader.c | 27 | ||||
| -rw-r--r-- | lib/sqfs/dir_reader/internal.h | 3 |
2 files changed, 11 insertions, 19 deletions
diff --git a/lib/sqfs/dir_reader/dir_reader.c b/lib/sqfs/dir_reader/dir_reader.c index 4ac9829..68cebd3 100644 --- a/lib/sqfs/dir_reader/dir_reader.c +++ b/lib/sqfs/dir_reader/dir_reader.c @@ -231,17 +231,18 @@ int sqfs_dir_reader_read(sqfs_dir_reader_t *rd, sqfs_dir_entry_t **out) switch (rd->state) { case DIR_STATE_OPENED: err = mk_dummy_entry(".", out); - if (err == 0) + if (err == 0) { rd->state = DIR_STATE_DOT; + rd->ent_ref = rd->cur_ref; + } return err; case DIR_STATE_DOT: err = mk_dummy_entry("..", out); - if (err == 0) - rd->state = DIR_STATE_DOT_DOT; + if (err == 0) { + rd->state = DIR_STATE_ENTRIES; + rd->ent_ref = rd->parent_ref; + } return err; - case DIR_STATE_DOT_DOT: - rd->state = DIR_STATE_ENTRIES; - break; case DIR_STATE_ENTRIES: break; default: @@ -288,23 +289,15 @@ int sqfs_dir_reader_find(sqfs_dir_reader_t *rd, const char *name) int sqfs_dir_reader_get_inode(sqfs_dir_reader_t *rd, sqfs_inode_generic_t **inode) { - sqfs_u64 ref; int ret; - switch (rd->state) { - case DIR_STATE_DOT: ref = rd->cur_ref; break; - case DIR_STATE_DOT_DOT: ref = rd->parent_ref; break; - case DIR_STATE_ENTRIES: ref = rd->ent_ref; break; - default: - return SQFS_ERROR_SEQUENCE; - } - ret = sqfs_meta_reader_read_inode(rd->meta_inode, rd->super, - ref >> 16, ref & 0x0FFFF, inode); + rd->ent_ref >> 16, + rd->ent_ref & 0x0FFFF, inode); if (ret != 0) return ret; - return dcache_add(rd, *inode, ref); + return dcache_add(rd, *inode, rd->ent_ref); } int sqfs_dir_reader_get_root_inode(sqfs_dir_reader_t *rd, diff --git a/lib/sqfs/dir_reader/internal.h b/lib/sqfs/dir_reader/internal.h index 63e7cb2..4b2ed21 100644 --- a/lib/sqfs/dir_reader/internal.h +++ b/lib/sqfs/dir_reader/internal.h @@ -27,8 +27,7 @@ enum { DIR_STATE_NONE = 0, DIR_STATE_OPENED = 1, DIR_STATE_DOT = 2, - DIR_STATE_DOT_DOT = 3, - DIR_STATE_ENTRIES = 4, + DIR_STATE_ENTRIES = 3, }; struct sqfs_dir_reader_t { |