static int print_metadata(WIMStruct *w)
{
-#ifdef ENABLE_SECURITY_DATA
print_security_data(wim_security_data(w));
-#endif
return for_dentry_in_tree(wim_root_dentry(w), print_dentry,
w->lookup_table);
}
WIMStruct *new_wim_struct()
{
- WIMStruct *w;
-
- w = CALLOC(1, sizeof(WIMStruct));
- if (!w)
- return NULL;
- w->link_type = WIM_LINK_TYPE_NONE;
- w->current_image = WIM_NO_IMAGE;
- return w;
+ return CALLOC(1, sizeof(WIMStruct));
}
/*
i = image;
end = image;
}
- do {
+ for (; i <= end; i++) {
ret = wimlib_select_image(w, i);
if (ret != 0)
return ret;
ret = visitor(w);
if (ret != 0)
return ret;
- } while (i++ != end);
+ }
return 0;
}
WIMStruct *w = wim_p;
if (lte->resource_entry.flags & WIM_RESHDR_FLAG_METADATA) {
+ /*fprintf(stderr, "found mlte at %u\n", lte->resource_entry.offset);*/
if (w->current_image == w->hdr.image_count) {
ERROR("Expected only %u images, but found more",
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);
-}
-
-WIMLIBAPI void wimlib_set_verbose(WIMStruct *w, bool verbose)
-{
- w->verbose = verbose;
-}
-
/*
* 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;
-#ifdef ENABLE_SECURITY_DATA
- free_security_data(imd->security_data);
imd->security_data = NULL;
-#endif
+ 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),
w->fp = fopen(in_wim_path, "rb");
if (!w->fp) {
- ERROR_WITH_ERRNO("Failed to open the file `%s' for reading");
+ ERROR_WITH_ERRNO("Failed to open the file `%s' for reading",
+ in_wim_path);
return WIMLIB_ERR_OPEN;
}
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);
- #ifdef ENABLE_SECURITY_DATA
- free_security_data(w->image_metadata[i].security_data);
- #endif
- }
+ for (uint i = 0; i < w->hdr.image_count; i++)
+ destroy_image_metadata(&w->image_metadata[i], NULL);
FREE(w->image_metadata);
}
FREE(w);