Don't call unmount_progress_func() when no progress msgs requested

[wimlib] / src / dentry.h

diff --git a/src/dentry.h b/src/dentry.h
index d03d42e94011b3842cee5bb4e17e0e2c85d69f02..afdb3619190e102ebf6b478b6954471af02973ef 100644 (file)
--- a/src/dentry.h
+++ b/src/dentry.h
@@ -197,7 +197,6 @@ struct dentry {
         */
        u64 length;
 
-
        /* The offset, from the start of the uncompressed WIM metadata resource
         * for this image, of this dentry's child dentries.  0 if the directory
         * entry has no children, which is the case for regular files or reparse
@@ -208,7 +207,7 @@ struct dentry {
         * WIMStructs */
        u32 refcnt;
 
-       u32   full_path_utf8_len;
+       u32 full_path_utf8_len;
 
        /* Pointer to the UTF-16 short filename (malloc()ed buffer) */
        char *short_name;
@@ -320,10 +319,7 @@ struct inode {
                list_for_each_entry((dentry), &(inode)->dentry_list, inode_dentry_list)
 
 #define inode_add_dentry(dentry, inode) \
-       ({                                                              \
-               wimlib_assert((inode)->dentry_list.next != NULL);               \
-               list_add(&(dentry)->inode_dentry_list, &(inode)->dentry_list);  \
-       })
+               list_add_tail(&(dentry)->inode_dentry_list, &(inode)->dentry_list)
 
 static inline bool dentry_is_first_in_inode(const struct dentry *dentry)
 {
@@ -334,9 +330,6 @@ static inline bool dentry_is_first_in_inode(const struct dentry *dentry)
 
 extern u64 dentry_correct_total_length(const struct dentry *dentry);
 
-extern int inode_to_stbuf(const struct inode *inode,
-                         struct lookup_table_entry *lte, struct stat *stbuf);
-
 extern int for_dentry_in_tree(struct dentry *root,
                              int (*visitor)(struct dentry*, void*),
                              void *args);