X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=src%2Fmodify.c;h=dc55d5fa8534ffc5ff0fcf0e7580e0511666bbd3;hp=2c92d821f44c83a762a1fe9b3e11aeeef82debb6;hb=aa882e9bb92d998707484d7f6f56e9cf109a7c62;hpb=63a5804943519281f206ca0fefacfe2b99fc9958 diff --git a/src/modify.c b/src/modify.c index 2c92d821..dc55d5fa 100644 --- a/src/modify.c +++ b/src/modify.c @@ -44,7 +44,7 @@ * the WIM image. */ #define WIMLIB_ADD_IMAGE_FLAG_ROOT 0x80000000 -void destroy_image_metadata(struct image_metadata *imd,struct lookup_table *lt) +void destroy_image_metadata(struct image_metadata *imd, struct lookup_table *lt) { free_dentry_tree(imd->root_dentry, lt); free_security_data(imd->security_data); @@ -131,9 +131,9 @@ static int build_dentry_tree(struct dentry **root_ret, const char *root_disk_pat if (!root) return WIMLIB_ERR_NOMEM; - stbuf_to_inode(&root_stbuf, root->inode); + stbuf_to_inode(&root_stbuf, root->d_inode); add_flags &= ~WIMLIB_ADD_IMAGE_FLAG_ROOT; - root->inode->resolved = true; + root->d_inode->resolved = true; if (dentry_is_directory(root)) { /* Open the directory on disk */ @@ -184,7 +184,7 @@ static int build_dentry_tree(struct dentry **root_ret, const char *root_disk_pat } deref_name_buf[deref_name_len] = '\0'; DEBUG("Read symlink `%s'", deref_name_buf); - ret = inode_set_symlink(root->inode, deref_name_buf, + ret = inode_set_symlink(root->d_inode, deref_name_buf, lookup_table, NULL); } else { /* Regular file */ @@ -226,7 +226,7 @@ static int build_dentry_tree(struct dentry **root_ret, const char *root_disk_pat copy_hash(lte->hash, hash); lookup_table_insert(lookup_table, lte); } - root->inode->lte = lte; + root->d_inode->lte = lte; } out: *root_ret = root; @@ -253,7 +253,7 @@ static int add_lte_to_dest_wim(struct dentry *dentry, void *arg) src_wim = ((struct wim_pair*)arg)->src_wim; dest_wim = ((struct wim_pair*)arg)->dest_wim; - inode = dentry->inode; + inode = dentry->d_inode; wimlib_assert(!inode->resolved); @@ -891,7 +891,7 @@ int do_add_image(WIMStruct *w, const char *dir, const char *name, if (flags & WIMLIB_ADD_IMAGE_FLAG_BOOT) wimlib_set_boot_idx(w, w->hdr.image_count); - ret = xml_add_image(w, root_dentry, name); + ret = xml_add_image(w, name); if (ret != 0) goto out_destroy_imd;