From: Eric Biggers <ebiggers3@gmail.com>
Date: Sat, 6 Apr 2013 22:19:48 +0000 (-0500)
Subject: xml_update_image_info(): Assume streams are resolved
X-Git-Tag: v1.3.3~88
X-Git-Url: https://wimlib.net/git/?p=wimlib;a=commitdiff_plain;h=e78d9abae1b03af6fb3b0c074a7b5641993373b4;ds=sidebyside

xml_update_image_info(): Assume streams are resolved
---

diff --git a/src/add_image.c b/src/add_image.c
index e65e1bce..c4c1033b 100644
--- a/src/add_image.c
+++ b/src/add_image.c
@@ -59,8 +59,8 @@ add_new_dentry_tree(WIMStruct *w, struct wim_dentry *root_dentry,
 		    struct wim_security_data *sd)
 {
 	struct wim_image_metadata *new_imd;
-	int ret;
 	struct wim_lookup_table_entry *metadata_lte;
+	int ret;
 
 	metadata_lte = new_lookup_table_entry();
 	if (!metadata_lte)
diff --git a/src/xml.c b/src/xml.c
index 97fbfd50..ff37757f 100644
--- a/src/xml.c
+++ b/src/xml.c
@@ -78,7 +78,6 @@ struct image_info {
 	tchar *display_name;
 	tchar *display_description;
 	tchar *flags;
-	struct wim_lookup_table *lookup_table; /* Temporary field only */
 };
 
 struct xml_string_spec {
@@ -1033,7 +1032,6 @@ static int
 calculate_dentry_statistics(struct wim_dentry *dentry, void *arg)
 {
 	struct image_info *info = arg;
-	struct wim_lookup_table *lookup_table = info->lookup_table;
 	const struct wim_inode *inode = dentry->d_inode;
 	struct wim_lookup_table_entry *lte;
 
@@ -1080,7 +1078,7 @@ calculate_dentry_statistics(struct wim_dentry *dentry, void *arg)
 	 * link bytes", and this size is multiplied by the link count (NOT one
 	 * less than the link count).
 	 */
-	lte = inode_unnamed_lte(inode, info->lookup_table);
+	lte = inode_unnamed_lte_resolved(inode);
 	if (lte) {
 		info->total_bytes += wim_resource_size(lte);
 		if (!dentry_is_first_in_inode(dentry))
@@ -1090,7 +1088,7 @@ calculate_dentry_statistics(struct wim_dentry *dentry, void *arg)
 	if (inode->i_nlink >= 2 && dentry_is_first_in_inode(dentry)) {
 		for (unsigned i = 0; i < inode->i_num_ads; i++) {
 			if (inode->i_ads_entries[i].stream_name_nbytes) {
-				lte = inode_stream_lte(inode, i + 1, lookup_table);
+				lte = inode_stream_lte_resolved(inode, i + 1);
 				if (lte) {
 					info->hard_link_bytes += inode->i_nlink *
 								 wim_resource_size(lte);
@@ -1121,7 +1119,6 @@ xml_update_image_info(WIMStruct *w, int image)
 	image_info->dir_count       = 0;
 	image_info->total_bytes     = 0;
 	image_info->hard_link_bytes = 0;
-	image_info->lookup_table = w->lookup_table;
 
 	for_dentry_in_tree(w->image_metadata[image - 1]->root_dentry,
 			   calculate_dentry_statistics,