Rename _full_path => d_full_path

[wimlib] / src / iterate_dir.c

diff --git a/src/iterate_dir.c b/src/iterate_dir.c
index 5bf138cc49e33c1da83ec9fbf9c922b29d2e474f..7cc7f0f5d07a6eb4c324ef7e451728d26290e82b 100644 (file)
--- a/src/iterate_dir.c
+++ b/src/iterate_dir.c
@@ -91,12 +91,12 @@ init_wimlib_dentry(struct wimlib_dir_entry *wdentry, struct wim_dentry *dentry,
        const struct wim_inode_stream *strm;
        struct wimlib_unix_data unix_data;
 
-       ret = utf16le_get_tstr(dentry->file_name, dentry->file_name_nbytes,
+       ret = utf16le_get_tstr(dentry->d_name, dentry->d_name_nbytes,
                               &wdentry->filename, &dummy);
        if (ret)
                return ret;
 
-       ret = utf16le_get_tstr(dentry->short_name, dentry->short_name_nbytes,
+       ret = utf16le_get_tstr(dentry->d_short_name, dentry->d_short_name_nbytes,
                               &wdentry->dos_name, &dummy);
        if (ret)
                return ret;
@@ -104,12 +104,12 @@ init_wimlib_dentry(struct wimlib_dir_entry *wdentry, struct wim_dentry *dentry,
        ret = calculate_dentry_full_path(dentry);
        if (ret)
                return ret;
-       wdentry->full_path = dentry->_full_path;
+       wdentry->full_path = dentry->d_full_path;
 
        for (struct wim_dentry *d = dentry; !dentry_is_root(d); d = d->d_parent)
                wdentry->depth++;
 
-       if (inode->i_security_id >= 0) {
+       if (inode_has_security_descriptor(inode)) {
                struct wim_security_data *sd;
 
                sd = wim_get_current_security_data(wim);