From 149d7521d52629aea35468cc42a2ddce93ae5cb7 Mon Sep 17 00:00:00 2001 From: Artem Bityutskiy Date: Mon, 18 Apr 2011 17:47:29 +0300 Subject: fs-tests: integck: clean up add_dir_entry usage Make 'add_dir_entry()' consistent and allocate name for all types, not only for 'd' and 's'. Also, since 'add_dir_entry()' sets the parent - do not do this in the calling functions. This is a clean-up which makes 'add_dir_entry()' more consistent. Signed-off-by: Artem Bityutskiy --- tests/fs-tests/integrity/integck.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'tests') diff --git a/tests/fs-tests/integrity/integck.c b/tests/fs-tests/integrity/integck.c index 94ffeb8..03b3a01 100644 --- a/tests/fs-tests/integrity/integck.c +++ b/tests/fs-tests/integrity/integck.c @@ -399,6 +399,7 @@ static void add_dir_entry(struct dir_info *parent, char type, const char *name, if (entry->type == 'f') { struct file_info *file = target; + file->name = dup_string(name); entry->file = file; entry->next_link = file->links; if (file->links) @@ -472,7 +473,6 @@ static int dir_new(struct dir_info *parent, const char *name) free(path); dir = zalloc(sizeof(struct dir_info)); - dir->parent = parent; if (parent) add_dir_entry(parent, 'd', name, dir); return 0; @@ -545,8 +545,6 @@ static int file_new(struct dir_info *parent, const char *name) free(path); file = zalloc(sizeof(struct file_info)); - file->name = dup_string(name); - add_dir_entry(parent, 'f', name, file); add_fd(file, fd); return 0; -- cgit v1.2.3