* that can be printed without conversion. By default this field will
* be NULL and will only be calculated on-demand by the
* calculate_dentry_full_path() or dentry_full_path() functions. */
- tchar *_full_path;
+ tchar *d_full_path;
/* (Extraction only) Actual name to extract this dentry as. This may be
* either in 'tchars' or in 'utf16lechars', depending on what encoding
/*
* Calculate the full path to @dentry within the WIM image, if not already done.
*
- * The full name will be saved in the cached value 'dentry->_full_path'.
+ * The full name will be saved in the cached value 'dentry->d_full_path'.
*
* Whenever possible, use dentry_full_path() instead of calling this and
- * accessing _full_path directly.
+ * accessing d_full_path directly.
*
* Returns 0 or an error code resulting from a failed string conversion.
*/
size_t dummy;
const struct wim_dentry *d;
- if (dentry->_full_path)
+ if (dentry->d_full_path)
return 0;
ulen = 0;
wimlib_assert(p == ubuf);
return utf16le_to_tstr(ubuf, ulen * sizeof(utf16lechar),
- &dentry->_full_path, &dummy);
+ &dentry->d_full_path, &dummy);
}
/*
dentry_full_path(struct wim_dentry *dentry)
{
calculate_dentry_full_path(dentry);
- return dentry->_full_path;
+ return dentry->d_full_path;
}
static int
d_disassociate(dentry);
FREE(dentry->d_name);
FREE(dentry->d_short_name);
- FREE(dentry->_full_path);
+ FREE(dentry->d_full_path);
FREE(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 (ret)
return ret;
- template_dentry = get_dentry(template_wim, dentry->_full_path,
+ template_dentry = get_dentry(template_wim, dentry->d_full_path,
WIMLIB_CASE_SENSITIVE);
if (template_dentry == NULL) {
- DEBUG("\"%"TS"\": newly added file", dentry->_full_path);
+ DEBUG("\"%"TS"\": newly added file", dentry->d_full_path);
return 0;
}
if (inode_metadata_consistent(inode, template_inode, wim->blob_table,
template_wim->blob_table))
{
- DEBUG("\"%"TS"\": No change detected", dentry->_full_path);
+ DEBUG("\"%"TS"\": No change detected", dentry->d_full_path);
inode_copy_checksums(inode, template_inode, wim->blob_table,
template_wim->blob_table);
inode->i_visited = 1;
} else {
- DEBUG("\"%"TS"\": change detected!", dentry->_full_path);
+ DEBUG("\"%"TS"\": change detected!", dentry->d_full_path);
}
return 0;
}
if (add_flags & WIMLIB_ADD_FLAG_VERBOSE) {
union wimlib_progress_info info;
- info.replace.path_in_wim = existing->_full_path;
+ info.replace.path_in_wim = existing->d_full_path;
ret = call_progress(progfunc,
WIMLIB_PROGRESS_MSG_REPLACE_FILE_IN_WIM,
&info, progctx);
static int
free_dentry_full_path(struct wim_dentry *dentry, void *_ignore)
{
- FREE(dentry->_full_path);
- dentry->_full_path = NULL;
+ FREE(dentry->d_full_path);
+ dentry->d_full_path = NULL;
return 0;
}
unlink_dentry(src);
dentry_add_child(parent_of_dst, src);
}
- if (src->_full_path)
+ if (src->d_full_path)
for_dentry_in_tree(src, free_dentry_full_path, NULL);
return 0;
}
if (ret)
return ret;
- if (!can_externally_back_path(dentry->_full_path,
- wcslen(dentry->_full_path), ctx))
+ if (!can_externally_back_path(dentry->d_full_path,
+ wcslen(dentry->d_full_path), ctx))
{
if (excluded_dentry_ret)
*excluded_dentry_ret = dentry;
build_extraction_path(excluded_dentry, ctx);
- info.wimboot_exclude.path_in_wim = excluded_dentry->_full_path;
+ info.wimboot_exclude.path_in_wim = excluded_dentry->d_full_path;
info.wimboot_exclude.extraction_path = current_path(ctx);
return call_progress(ctx->common.progfunc,