if (ret)
return ret;
- ret = read_xml_data(w->fp, &w->hdr.xml_res_entry,
- &w->xml_data, &w->wim_info);
+ ret = read_xml_data(w->fp, &w->hdr.xml_res_entry, &w->wim_info);
if (ret)
return ret;
INIT_LIST_HEAD(&imd->inode_list);
#ifdef WITH_NTFS_3G
if (imd->ntfs_vol) {
- do_ntfs_umount(imd->ntfs_vol);
+ do_ntfs_umount(imd->ntfs_vol);
imd->ntfs_vol = NULL;
}
#endif
fclose(w->fp_tab[i]);
FREE(w->fp_tab);
}
+#endif
+#if defined(WITH_FUSE) || defined(ENABLE_MULTITHREADED_COMPRESSION)
pthread_mutex_destroy(&w->fp_tab_mutex);
#endif
free_lookup_table(w->lookup_table);
FREE(w->filename);
- FREE(w->xml_data);
free_wim_info(w->wim_info);
if (w->image_metadata) {
for (unsigned i = 0; i < w->hdr.image_count; i++)
#endif
}
-/* Get global memory allocations out of the way,
- * single-threaded programs like 'imagex'. */
WIMLIBAPI int
-wimlib_global_init()
+wimlib_global_init(int init_flags)
{
libxml_global_init();
-#ifdef WITH_NTFS_3G
- libntfs3g_global_init();
-#endif
- wimlib_mbs_is_utf8 = test_locale_ctype_utf8();
+ if (!(init_flags & WIMLIB_INIT_FLAG_ASSUME_UTF8)) {
+ wimlib_mbs_is_utf8 = test_locale_ctype_utf8();
+ #ifdef WITH_NTFS_3G
+ if (!wimlib_mbs_is_utf8)
+ libntfs3g_global_init();
+ #endif
+ }
#ifdef __WIN32__
win32_global_init();
#endif