diff options
author | David Oberhollenzer <david.oberhollenzer@sigma-star.at> | 2019-09-27 16:43:11 +0200 |
---|---|---|
committer | David Oberhollenzer <david.oberhollenzer@sigma-star.at> | 2019-09-27 16:43:11 +0200 |
commit | 625368eb5bcb9954ad190af50962e6b7c2fd9c4c (patch) | |
tree | 48779d7e54b4fa3df83df39fff76b54d93aacedf /lib/fstree/add_by_path.c | |
parent | 720023d968b24fe358fd4cfb002d8572f6cc96e7 (diff) |
Cleanup: remove most of the payload pointer magic from libfstree
Now that dir_info_t and file_info_t have reasonably small, use them in
tree_node_t directly instead of doing pointer arithmetic magic on the
payload area.
Signed-off-by: David Oberhollenzer <david.oberhollenzer@sigma-star.at>
Diffstat (limited to 'lib/fstree/add_by_path.c')
-rw-r--r-- | lib/fstree/add_by_path.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/fstree/add_by_path.c b/lib/fstree/add_by_path.c index 87fa6ff..bd47a76 100644 --- a/lib/fstree/add_by_path.c +++ b/lib/fstree/add_by_path.c @@ -14,7 +14,7 @@ static tree_node_t *child_by_name(tree_node_t *root, const char *name, size_t len) { - tree_node_t *n = root->data.dir->children; + tree_node_t *n = root->data.dir.children; while (n != NULL) { if (strncmp(n->name, name, len) == 0 && n->name[len] == '\0') @@ -50,7 +50,7 @@ static tree_node_t *get_parent_node(fstree_t *fs, tree_node_t *root, if (n == NULL) return NULL; - n->data.dir->created_implicitly = true; + n->data.dir.created_implicitly = true; } root = n; @@ -76,7 +76,7 @@ tree_node_t *fstree_add_generic(fstree_t *fs, const char *path, child = child_by_name(parent, name, strlen(name)); if (child != NULL) { if (!S_ISDIR(child->mode) || !S_ISDIR(sb->st_mode) || - !child->data.dir->created_implicitly) { + !child->data.dir.created_implicitly) { errno = EEXIST; return NULL; } @@ -85,7 +85,7 @@ tree_node_t *fstree_add_generic(fstree_t *fs, const char *path, child->gid = sb->st_gid; child->mode = sb->st_mode; child->mod_time = sb->st_mtime; - child->data.dir->created_implicitly = false; + child->data.dir.created_implicitly = false; return child; } |