[PATCH v5 2/6] dir_iterator: refactor state machine model
- From
Daniel Ferreira <bnmvco@gmail.com>
- Date
- Mar 30, 2017, 03:32 UTC
- Message-ID
- <1490844730-47634-3-git-send-email-bnmvco@gmail.com>
- In-Reply-To
- <1490844730-47634-1-git-send-email-bnmvco@gmail.com>
Remove the "initialized" member of dir_iterator_level. Replace its functionality with a DIR_STATE_PUSH state in the dir_iterator_level.dir_state enum.
This serves to remove a redundant property in the dir_iterator_level struct and ease comprehension of the state machine's behavior.
Signed-off-by: Daniel Ferreira <bnmvco@gmail.com> --- dir-iterator.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-)
diff --git a/dir-iterator.c b/dir-iterator.c index ce8bf81..3ac984b 100644 --- a/dir-iterator.c +++ b/dir-iterator.c @@ -4,8 +4,6 @@ #include "dir-iterator.h" struct dir_iterator_level { - int initialized; - DIR *dir; /* @@ -20,6 +18,7 @@ struct dir_iterator_level { * iteration and also iterated into): */ enum { + DIR_STATE_PUSH, DIR_STATE_ITER, DIR_STATE_RECURSE } dir_state; @@ -55,8 +54,10 @@ static inline void push_dir_level(struct dir_iterator_int *iter, struct dir_iter level->dir_state = DIR_STATE_RECURSE; ALLOC_GROW(iter->levels, iter->levels_nr + 1, iter->levels_alloc); + + /* Push a new level */ level = &iter->levels[iter->levels_nr++]; - level->initialized = 0; + level->dir_state = DIR_STATE_PUSH; } static inline int pop_dir_level(struct dir_iterator_int *iter) @@ -97,7 +98,7 @@ int dir_iterator_advance(struct dir_iterator *dir_iterator) &iter->levels[iter->levels_nr - 1]; struct dirent *de; - if (!level->initialized) { + if (level->dir_state == DIR_STATE_PUSH) { /* * Note: dir_iterator_begin() ensures that * path is not the empty string. @@ -112,8 +113,6 @@ int dir_iterator_advance(struct dir_iterator *dir_iterator) iter->base.path.buf, strerror(errno)); /* Popping the level is handled below */ } - - level->initialized = 1; } else if (S_ISDIR(iter->base.st.st_mode)) { if (level->dir_state == DIR_STATE_ITER) { /* @@ -215,7 +214,7 @@ struct dir_iterator *dir_iterator_begin(const char *path) ALLOC_GROW(iter->levels, 10, iter->levels_alloc); iter->levels_nr = 1; - iter->levels[0].initialized = 0; + iter->levels[0].dir_state = DIR_STATE_PUSH; return dir_iterator; } -- 2.7.4 (Apple Git-66)