X-Git-Url: https://wimlib.net/git/?a=blobdiff_plain;f=src%2Fdentry.c;h=0e8d81f40cb798b6a05ce5866b0f1714f4008424;hb=5cdd60306facd14cc9dcc24471386451294ca73c;hp=a9db942f81168ac18ad86432ebd8122423662f10;hpb=9b25b1a8e4c01e57f2872fe9e825f0dc81329008;p=wimlib

diff --git a/src/dentry.c b/src/dentry.c
index a9db942f..0e8d81f4 100644
--- a/src/dentry.c
+++ b/src/dentry.c
@@ -71,16 +71,6 @@ static u64 dentry_correct_length(const struct dentry *dentry)
 	return (dentry_correct_length_unaligned(dentry) + 7) & ~7;
 }
 
-/* Return %true iff @dentry has the UTF-8 file name @name that has length
- * @name_len bytes. */
-static bool dentry_has_name(const struct dentry *dentry, const char *name,
-			    size_t name_len)
-{
-	if (dentry->file_name_utf8_len != name_len)
-		return false;
-	return memcmp(dentry->file_name_utf8, name, name_len) == 0;
-}
-
 /* Return %true iff the alternate data stream entry @entry has the UTF-8 stream
  * name @name that has length @name_len bytes. */
 static inline bool ads_entry_has_name(const struct ads_entry *entry,
@@ -185,28 +175,6 @@ static u64 dentry_total_length(const struct dentry *dentry)
 	return __dentry_total_length(dentry, dentry->length);
 }
 
-/* Transfers file attributes from a `stat' buffer to a WIM "inode". */
-void stbuf_to_inode(const struct stat *stbuf, struct inode *inode)
-{
-	if (S_ISLNK(stbuf->st_mode)) {
-		inode->attributes = FILE_ATTRIBUTE_REPARSE_POINT;
-		inode->reparse_tag = WIM_IO_REPARSE_TAG_SYMLINK;
-	} else if (S_ISDIR(stbuf->st_mode)) {
-		inode->attributes = FILE_ATTRIBUTE_DIRECTORY;
-	} else {
-		inode->attributes = FILE_ATTRIBUTE_NORMAL;
-	}
-	if (sizeof(ino_t) >= 8)
-		inode->ino = (u64)stbuf->st_ino;
-	else
-		inode->ino = (u64)stbuf->st_ino |
-				   ((u64)stbuf->st_dev << ((sizeof(ino_t) * 8) & 63));
-	/* Set timestamps */
-	inode->creation_time = timespec_to_wim_timestamp(&stbuf->st_mtim);
-	inode->last_write_time = timespec_to_wim_timestamp(&stbuf->st_mtim);
-	inode->last_access_time = timespec_to_wim_timestamp(&stbuf->st_atim);
-}
-
 #ifdef WITH_FUSE
 /* Transfers file attributes from a struct inode to a `stat' buffer.
  *
@@ -306,20 +274,18 @@ static int for_dentry_tree_in_rbtree_depth(struct rb_node *node,
 
 #ifdef RECURSIVE_FOR_DENTRY_IN_TREE
 static int for_dentry_tree_in_rbtree(struct rb_node *node,
-					   int (*visitor)(struct dentry*, void*),
-					   void *arg)
+				     int (*visitor)(struct dentry*, void*),
+				     void *arg)
 {
 	int ret;
 	if (node) {
-		ret = for_dentry_tree_in_rbtree(node->rb_left,
-						      visitor, arg);
+		ret = for_dentry_tree_in_rbtree(node->rb_left, visitor, arg);
 		if (ret != 0)
 			return ret;
 		ret = for_dentry_in_tree(rbnode_dentry(node), visitor, arg);
 		if (ret != 0)
 			return ret;
-		ret = for_dentry_tree_in_rbtree(node->rb_right,
-						      visitor, arg);
+		ret = for_dentry_tree_in_rbtree(node->rb_right, visitor, arg);
 		if (ret != 0)
 			return ret;
 	}
@@ -1071,9 +1037,8 @@ static int do_free_dentry(struct dentry *dentry, void *__lookup_table)
  */
 void free_dentry_tree(struct dentry *root, struct lookup_table *lookup_table)
 {
-	if (!root || !root->parent)
-		return;
-	for_dentry_in_tree_depth(root, do_free_dentry, lookup_table);
+	if (root)
+		for_dentry_in_tree_depth(root, do_free_dentry, lookup_table);
 }
 
 int increment_dentry_refcnt(struct dentry *dentry, void *ignore)
@@ -1817,8 +1782,6 @@ int read_dentry_tree(const u8 metadata_resource[], u64 metadata_resource_len,
 		     struct dentry *dentry)
 {
 	u64 cur_offset = dentry->subdir_offset;
-	struct dentry *prev_child = NULL;
-	struct dentry *first_child = NULL;
 	struct dentry *child;
 	struct dentry cur_child;
 	int ret;
@@ -1855,9 +1818,7 @@ int read_dentry_tree(const u8 metadata_resource[], u64 metadata_resource_len,
 			break;
 		}
 		memcpy(child, &cur_child, sizeof(struct dentry));
-
 		dentry_add_child(dentry, child);
-
 		inode_add_dentry(child, child->d_inode);
 
 		/* If there are children of this child, call this procedure