Make lookup table use hlist

[wimlib] / src / wim.c

diff --git a/src/wim.c b/src/wim.c
index 12b8418327eaa79dc596982f77f52f610835091e..b2ed8d98b77b58c1f439818e81f6dcf655482198 100644 (file)
--- a/src/wim.c
+++ b/src/wim.c
@@ -207,10 +207,10 @@ int wimlib_select_image(WIMStruct *w, int image)
                imd = wim_get_current_image_metadata(w);
                if (!imd->modified) {
                        DEBUG("Freeing image %u", w->current_image);
-                       free_dentry_tree(imd->root_dentry, NULL, false);
+                       destroy_image_metadata(imd, NULL);
                        imd->root_dentry = NULL;
-                       free_security_data(imd->security_data);
                        imd->security_data = NULL;
+                       imd->lgt = NULL;
                }
        }
 
@@ -528,7 +528,7 @@ WIMLIBAPI int wimlib_open_wim(const char *wim_file, int flags,
 
        ret = begin_read(w, wim_file, flags);
        if (ret != 0) {
-               ERROR("Could not begin reading the WIM file `%s'", wim_file);
+               DEBUG("Could not begin reading the WIM file `%s'", wim_file);
                wimlib_free(w);
                return ret;
        }
@@ -540,7 +540,7 @@ WIMLIBAPI int wimlib_open_wim(const char *wim_file, int flags,
  * closes all files associated with the WIMStruct.  */
 WIMLIBAPI void wimlib_free(WIMStruct *w)
 {
-       uint i;
+       DEBUG("Freeing WIMStruct");
 
        if (!w)
                return;
@@ -552,15 +552,11 @@ WIMLIBAPI void wimlib_free(WIMStruct *w)
        free_lookup_table(w->lookup_table);
 
        FREE(w->filename);
-       FREE(w->output_dir);
        FREE(w->xml_data);
        free_wim_info(w->wim_info);
        if (w->image_metadata) {
-               for (i = 0; i < w->hdr.image_count; i++) {
-                       free_dentry_tree(w->image_metadata[i].root_dentry, 
-                                        NULL, false);
-                       free_security_data(w->image_metadata[i].security_data);
-               }
+               for (uint i = 0; i < w->hdr.image_count; i++)
+                       destroy_image_metadata(&w->image_metadata[i], NULL);
                FREE(w->image_metadata);
        }
        FREE(w);