#include "xml.h"
#include <stdlib.h>
+#ifdef WITH_NTFS_3G
+#include <ntfs-3g/volume.h>
+#endif
+
static int print_metadata(WIMStruct *w)
{
print_security_data(wim_security_data(w));
int i;
int end;
- DEBUG("for_image(w = %p, image = %d, visitor = %p)", w, image, visitor);
-
if (image == WIM_ALL_IMAGES) {
i = 1;
end = w->hdr.image_count;
}
}
-int wim_resource_compression_type(const WIMStruct *w,
- const struct resource_entry *entry)
-{
- int wim_ctype = wimlib_get_compression_type(w);
- return resource_compression_type(wim_ctype, entry->flags);
-}
-
/*
* Creates a WIMStruct for a new WIM file.
*/
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;
}
}
#ifdef ENABLE_DEBUG
DEBUG("Reading metadata resource specified by the following "
"lookup table entry:");
- print_lookup_table_entry(imd->metadata_lte, NULL);
+ print_lookup_table_entry(imd->metadata_lte);
#endif
- return read_metadata_resource(w->fp,
- wimlib_get_compression_type(w),
- imd);
+ return read_metadata_resource(w, imd);
}
}
* not WIM_NO_IMAGE. */
WIMLIBAPI int wimlib_print_metadata(WIMStruct *w, int image)
{
+ if (image == WIM_ALL_IMAGES)
+ DEBUG("Printing metadata for all images");
+ else
+ DEBUG("Printing metadata for image %d", image);
return for_image(w, image, print_metadata);
}
return WIMLIB_ERR_COMPRESSED_LOOKUP_TABLE;
}
- ret = read_lookup_table(w->fp, w->hdr.lookup_table_res_entry.offset,
- w->hdr.lookup_table_res_entry.size,
- &w->lookup_table);
+ ret = read_lookup_table(w);
if (ret != 0)
return ret;
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;
}
* closes all files associated with the WIMStruct. */
WIMLIBAPI void wimlib_free(WIMStruct *w)
{
- uint i;
+ DEBUG("Freeing WIMStruct");
if (!w)
return;
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);
}
+#ifdef WITH_NTFS_3G
+ if (w->ntfs_vol) {
+ DEBUG("Unmounting NTFS volume");
+ ntfs_umount(w->ntfs_vol, FALSE);
+ }
+#endif
FREE(w);
}