/* 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);
}
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;
}
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;
}
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;
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;
}
* 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;
* 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;
}
* 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;
}
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)",
/* 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,
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)