diff --git a/dongle_infrastructure.c b/dongle_infrastructure.c index 8e4a167fcd9394d8fa5942af617cee67d534a4f9..a8dc5b060b210c469172bb593e789977550db33a 100644 --- a/dongle_infrastructure.c +++ b/dongle_infrastructure.c @@ -213,10 +213,10 @@ char *get_device_name(char *dir_name) goto fail; } dr->path = strdup(dir_name); - enqueue(dr, &stack); + push(dr, &stack); while (!list_empty(&stack) && !name) { - dr = dequeue(&stack); + dr = pop(&stack); dir = opendir(dr->path); if (!dir) continue; @@ -224,7 +224,7 @@ char *get_device_name(char *dir_name) if (!search(dr->path, &visited)) continue; - enqueue(dr, &visited); + push(dr, &visited); while ((de = readdir(dir)) != NULL) { if (strcmp(de->d_name, ".") == 0 || strcmp(de->d_name, "..") == 0) @@ -248,7 +248,7 @@ char *get_device_name(char *dir_name) } sub_dr->path = strdup(path); - enqueue(sub_dr, &stack); + push(sub_dr, &stack); continue; } diff --git a/dfs.c b/stack.c similarity index 88% rename from dfs.c rename to stack.c index a3cf1716d57a8ae0f77507e792f50fc59c69080a..d18efc2b4726ceee7a1e74272b53a38dd01b38b5 100644 --- a/dfs.c +++ b/stack.c @@ -1,13 +1,13 @@ #include "dfs.h" -void enqueue(struct directory *dr, struct list_head *list) +void push(struct directory *dr, struct list_head *list) { if (list_empty(list)) INIT_LIST_HEAD(list); list_add(&dr->list, list); } -struct directory *dequeue(struct list_head *list) +struct directory *pop(struct list_head *list) { struct directory *dr; diff --git a/dfs.h b/stack.h similarity index 69% rename from dfs.h rename to stack.h index 68cf79be9d58e3a2c4625c6d8c605eef73fc241a..a94e482d377a8fd6edf5626e8e529eb9ef9b95c8 100644 --- a/dfs.h +++ b/stack.h @@ -7,8 +7,8 @@ struct directory { char *path; }; -void enqueue(struct directory *n, struct list_head *list); -struct directory *dequeue(struct list_head *list); +void push(struct directory *n, struct list_head *list); +struct directory *pop(struct list_head *list); bool search(char *path, struct list_head *list); void clear_list(struct list_head *list); void print_list_dfs(struct list_head *list);