summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArtem Bityutskiy <Artem.Bityutskiy@nokia.com>2011-04-18 17:47:29 +0300
committerArtem Bityutskiy <Artem.Bityutskiy@nokia.com>2011-04-22 14:29:53 +0300
commit149d7521d52629aea35468cc42a2ddce93ae5cb7 (patch)
tree0ad61a7fcc0df338fa5b529a099ea4c4b7ac699f
parent4499ce3b223410d010380efa0bbbcb1c00722006 (diff)
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 <Artem.Bityutskiy@nokia.com>
-rw-r--r--tests/fs-tests/integrity/integck.c4
1 files changed, 1 insertions, 3 deletions
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;