From c5fd49890aca1059262b986942a66542127c63af Mon Sep 17 00:00:00 2001 From: Eric Biggers Date: Sun, 31 May 2015 10:04:27 -0500 Subject: [PATCH 1/1] Rename tmp_list => d_tmp_list --- include/wimlib/dentry.h | 2 +- src/update_image.c | 12 ++++++------ src/win32_apply.c | 18 +++++++++--------- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/include/wimlib/dentry.h b/include/wimlib/dentry.h index ba61018a..4adc5fed 100644 --- a/include/wimlib/dentry.h +++ b/include/wimlib/dentry.h @@ -92,7 +92,7 @@ struct wim_dentry { u64 subdir_offset; /* Temporary list field */ - struct list_head tmp_list; + struct list_head d_tmp_list; }; /* Full path to this dentry in the WIM, in platform-dependent tchars diff --git a/src/update_image.c b/src/update_image.c index 359dffe3..82da53f4 100644 --- a/src/update_image.c +++ b/src/update_image.c @@ -181,8 +181,8 @@ free_update_command_journal(struct update_command_journal *j) /* Free orphaned dentry trees */ while (!list_empty(&j->orphans)) { orphan = list_first_entry(&j->orphans, - struct wim_dentry, tmp_list); - list_del(&orphan->tmp_list); + struct wim_dentry, d_tmp_list); + list_del(&orphan->d_tmp_list); free_dentry_tree(orphan, j->blob_table); } @@ -266,7 +266,7 @@ rollback_link(struct wim_dentry *subject, struct wim_dentry *parent, do_unlink(subject, parent, root_p); /* @subject is now unlinked. Add it to orphans. */ - list_add(&subject->tmp_list, orphans); + list_add(&subject->d_tmp_list, orphans); subject->d_is_orphan = 1; } @@ -279,7 +279,7 @@ rollback_unlink(struct wim_dentry *subject, struct wim_dentry *parent, do_link(subject, parent, root_p); /* @subject is no longer unlinked. Delete it from orphans. */ - list_del(&subject->tmp_list); + list_del(&subject->d_tmp_list); subject->d_is_orphan = 0; } @@ -363,7 +363,7 @@ journaled_link(struct update_command_journal *j, do_link(subject, parent, j->root_p); if (subject->d_is_orphan) { - list_del(&subject->tmp_list); + list_del(&subject->d_tmp_list); subject->d_is_orphan = 0; } return 0; @@ -394,7 +394,7 @@ journaled_unlink(struct update_command_journal *j, struct wim_dentry *subject) do_unlink(subject, parent, j->root_p); - list_add(&subject->tmp_list, &j->orphans); + list_add(&subject->d_tmp_list, &j->orphans); subject->d_is_orphan = 1; return 0; } diff --git a/src/win32_apply.c b/src/win32_apply.c index 45b1d653..7eb0ce27 100644 --- a/src/win32_apply.c +++ b/src/win32_apply.c @@ -122,12 +122,12 @@ struct win32_apply_ctx { * beginning of the array) */ unsigned num_open_handles; - /* List of dentries, joined by @tmp_list, that need to have reparse data - * extracted as soon as the whole blob has been read into @data_buffer. - * */ + /* List of dentries, joined by @d_tmp_list, that need to have reparse + * data extracted as soon as the whole blob has been read into + * @data_buffer. */ struct list_head reparse_dentries; - /* List of dentries, joined by @tmp_list, that need to have raw + /* List of dentries, joined by @d_tmp_list, that need to have raw * encrypted data extracted as soon as the whole blob has been read into * @data_buffer. */ struct list_head encrypted_dentries; @@ -1815,7 +1815,7 @@ begin_extract_blob_instance(const struct blob_descriptor *blob, * data be available. So, stage the data in a buffer. */ if (!prepare_data_buffer(ctx, blob->size)) return WIMLIB_ERR_NOMEM; - list_add_tail(&dentry->tmp_list, &ctx->reparse_dentries); + list_add_tail(&dentry->d_tmp_list, &ctx->reparse_dentries); return 0; } @@ -1833,7 +1833,7 @@ begin_extract_blob_instance(const struct blob_descriptor *blob, * such files... */ if (!prepare_data_buffer(ctx, blob->size)) return WIMLIB_ERR_NOMEM; - list_add_tail(&dentry->tmp_list, &ctx->encrypted_dentries); + list_add_tail(&dentry->d_tmp_list, &ctx->encrypted_dentries); return 0; } @@ -2233,7 +2233,7 @@ end_extract_blob(struct blob_descriptor *blob, int status, void *_ctx) if (!list_empty(&ctx->reparse_dentries)) { if (blob->size > REPARSE_DATA_MAX_SIZE) { dentry = list_first_entry(&ctx->reparse_dentries, - struct wim_dentry, tmp_list); + struct wim_dentry, d_tmp_list); build_extraction_path(dentry, ctx); ERROR("Reparse data of \"%ls\" has size " "%"PRIu64" bytes (exceeds %u bytes)", @@ -2245,7 +2245,7 @@ end_extract_blob(struct blob_descriptor *blob, int status, void *_ctx) /* Reparse data */ memcpy(ctx->rpbuf.rpdata, ctx->data_buffer, blob->size); - list_for_each_entry(dentry, &ctx->reparse_dentries, tmp_list) { + list_for_each_entry(dentry, &ctx->reparse_dentries, d_tmp_list) { /* Reparse point header */ complete_reparse_point(&ctx->rpbuf, dentry->d_inode, @@ -2262,7 +2262,7 @@ end_extract_blob(struct blob_descriptor *blob, int status, void *_ctx) if (!list_empty(&ctx->encrypted_dentries)) { ctx->encrypted_size = blob->size; - list_for_each_entry(dentry, &ctx->encrypted_dentries, tmp_list) { + list_for_each_entry(dentry, &ctx->encrypted_dentries, d_tmp_list) { ret = extract_encrypted_file(dentry, ctx); ret = check_apply_error(dentry, ctx, ret); if (ret) -- 2.43.0