X-Git-Url: https://wimlib.net/git/?a=blobdiff_plain;f=src%2Fwim.c;h=0900fead567803f0e765e76e9e0b7d0bfef87cb7;hb=66f034667af2167ccaa21e7f4ea9811cef443ab9;hp=342281d382fed08bf7ed461bcf2c611fb90a912c;hpb=2af95e7dc313e9abaf571034c3e86f32503bf232;p=wimlib

diff --git a/src/wim.c b/src/wim.c
index 342281d3..0900fead 100644
--- a/src/wim.c
+++ b/src/wim.c
@@ -470,8 +470,7 @@ begin_read(WIMStruct *w, const tchar *in_wim_path, int open_flags,
 	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;
 
@@ -537,7 +536,7 @@ destroy_image_metadata(struct wim_image_metadata *imd,
 	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
@@ -658,13 +657,14 @@ wimlib_free(WIMStruct *w)
 				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++)
@@ -690,16 +690,17 @@ test_locale_ctype_utf8()
 #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