wimlib_free(): Add missing pthread_mutex_destroy()

[wimlib] / src / wim.c

diff --git a/src/wim.c b/src/wim.c
index 25b5c3367d9e2bd7421b6889a2234f22333756a4..0900fead567803f0e765e76e9e0b7d0bfef87cb7 100644 (file)
--- a/src/wim.c
+++ b/src/wim.c
@@ -65,7 +65,7 @@ static WIMStruct *
 new_wim_struct()
 {
        WIMStruct *w = CALLOC(1, sizeof(WIMStruct));
-#ifdef WITH_FUSE
+#if defined(WITH_FUSE) || defined(ENABLE_MULTITHREADED_COMPRESSION)
        if (pthread_mutex_init(&w->fp_tab_mutex, NULL) != 0) {
                ERROR_WITH_ERRNO("Failed to initialize mutex");
                FREE(w);
@@ -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
@@ -627,10 +626,8 @@ wim_checksum_unhashed_streams(WIMStruct *w)
        int ret;
        for (int i = 0; i < w->hdr.image_count; i++) {
                struct wim_lookup_table_entry *lte, *tmp;
-               list_for_each_entry_safe(lte, tmp,
-                                        &w->image_metadata[i]->unhashed_streams,
-                                        unhashed_list)
-               {
+               struct wim_image_metadata *imd = w->image_metadata[i];
+               image_for_each_unhashed_stream_safe(lte, tmp, imd) {
                        ret = hash_unhashed_stream(lte, w->lookup_table, NULL);
                        if (ret)
                                return ret;
@@ -660,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++)
@@ -692,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