From ee547cc83f231d727e4d9984c23e86d96d3da769 Mon Sep 17 00:00:00 2001 From: Eric Biggers Date: Sun, 31 May 2015 10:13:06 -0500 Subject: [PATCH] Rename _full_path => d_full_path --- include/wimlib/dentry.h | 2 +- src/dentry.c | 12 ++++++------ src/iterate_dir.c | 2 +- src/template.c | 8 ++++---- src/update_image.c | 8 ++++---- src/win32_apply.c | 6 +++--- 6 files changed, 19 insertions(+), 19 deletions(-) diff --git a/include/wimlib/dentry.h b/include/wimlib/dentry.h index e92b374f..cbc0b7c3 100644 --- a/include/wimlib/dentry.h +++ b/include/wimlib/dentry.h @@ -99,7 +99,7 @@ struct wim_dentry { * 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 diff --git a/src/dentry.c b/src/dentry.c index a1a312db..49c0cdf1 100644 --- a/src/dentry.c +++ b/src/dentry.c @@ -472,10 +472,10 @@ for_dentry_in_tree_depth(struct wim_dentry *root, /* * 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. */ @@ -486,7 +486,7 @@ calculate_dentry_full_path(struct wim_dentry *dentry) size_t dummy; const struct wim_dentry *d; - if (dentry->_full_path) + if (dentry->d_full_path) return 0; ulen = 0; @@ -511,7 +511,7 @@ calculate_dentry_full_path(struct wim_dentry *dentry) wimlib_assert(p == ubuf); return utf16le_to_tstr(ubuf, ulen * sizeof(utf16lechar), - &dentry->_full_path, &dummy); + &dentry->d_full_path, &dummy); } /* @@ -525,7 +525,7 @@ tchar * dentry_full_path(struct wim_dentry *dentry) { calculate_dentry_full_path(dentry); - return dentry->_full_path; + return dentry->d_full_path; } static int @@ -1008,7 +1008,7 @@ free_dentry(struct wim_dentry *dentry) d_disassociate(dentry); FREE(dentry->d_name); FREE(dentry->d_short_name); - FREE(dentry->_full_path); + FREE(dentry->d_full_path); FREE(dentry); } } diff --git a/src/iterate_dir.c b/src/iterate_dir.c index c9de38cf..7cc7f0f5 100644 --- a/src/iterate_dir.c +++ b/src/iterate_dir.c @@ -104,7 +104,7 @@ 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++; diff --git a/src/template.c b/src/template.c index 1fd6d93d..ed1dd19e 100644 --- a/src/template.c +++ b/src/template.c @@ -141,10 +141,10 @@ dentry_reference_template(struct wim_dentry *dentry, void *_args) 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; } @@ -154,12 +154,12 @@ dentry_reference_template(struct wim_dentry *dentry, void *_args) 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; } diff --git a/src/update_image.c b/src/update_image.c index 82da53f4..c15a31b0 100644 --- a/src/update_image.c +++ b/src/update_image.c @@ -550,7 +550,7 @@ handle_conflict(struct wim_dentry *branch, struct wim_dentry *existing, 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); @@ -919,8 +919,8 @@ execute_delete_command(struct update_command_journal *j, 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; } @@ -1017,7 +1017,7 @@ rename_wim_path(WIMStruct *wim, const tchar *from, const tchar *to, 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; } diff --git a/src/win32_apply.c b/src/win32_apply.c index 7eb0ce27..1155b2a5 100644 --- a/src/win32_apply.c +++ b/src/win32_apply.c @@ -492,8 +492,8 @@ will_externally_back_inode(struct wim_inode *inode, struct win32_apply_ctx *ctx, 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; @@ -557,7 +557,7 @@ set_external_backing(HANDLE h, struct wim_inode *inode, struct win32_apply_ctx * 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, -- 2.43.0