X-Git-Url: https://wimlib.net/git/?a=blobdiff_plain;f=src%2Fwim.c;h=a3dd135cb820b098501ab439bf8d53a1150984f7;hb=34193844b60cf16bb0a04e344ddf47a0614a7643;hp=2942863c938859e44d2ba62f2c4c2073492e395a;hpb=d444f2e5ddee51e7d9d0401cffcf88477c180422;p=wimlib

diff --git a/src/wim.c b/src/wim.c
index 2942863c..a3dd135c 100644
--- a/src/wim.c
+++ b/src/wim.c
@@ -66,9 +66,7 @@ static u32
 wim_default_pack_chunk_size(int ctype) {
 	switch (ctype) {
 	case WIMLIB_COMPRESSION_TYPE_LZMS:
-		/* Note: WIMGAPI uses 1 << 26, but lower sizes are compatible.
-		 * */
-		return 1U << 25; /* 33554432  */
+		return 1U << 26; /* 67108864  */
 	default:
 		return 1U << 15; /* 32768     */
 	}
@@ -551,8 +549,6 @@ static int
 set_out_ctype(int ctype, u8 *out_ctype_p)
 {
 	switch (ctype) {
-	case WIMLIB_COMPRESSION_TYPE_INVALID:
-		break;
 	case WIMLIB_COMPRESSION_TYPE_NONE:
 	case WIMLIB_COMPRESSION_TYPE_LZX:
 	case WIMLIB_COMPRESSION_TYPE_XPRESS:
@@ -1015,13 +1011,13 @@ wimlib_get_version(void)
 	return WIMLIB_VERSION_CODE;
 }
 
+static bool lib_initialized = false;
+
 /* API function documented in wimlib.h  */
 WIMLIBAPI int
 wimlib_global_init(int init_flags)
 {
-	static bool already_inited = false;
-
-	if (already_inited)
+	if (lib_initialized)
 		return 0;
 
 	if (init_flags & ~(WIMLIB_INIT_FLAG_ASSUME_UTF8 |
@@ -1047,12 +1043,13 @@ wimlib_global_init(int init_flags)
 			return ret;
 	}
 #endif
+	iconv_global_init();
 	init_upcase();
 	if (init_flags & WIMLIB_INIT_FLAG_DEFAULT_CASE_SENSITIVE)
 		default_ignore_case = false;
 	else if (init_flags & WIMLIB_INIT_FLAG_DEFAULT_CASE_INSENSITIVE)
 		default_ignore_case = true;
-	already_inited = true;
+	lib_initialized = true;
 	return 0;
 }
 
@@ -1060,6 +1057,8 @@ wimlib_global_init(int init_flags)
 WIMLIBAPI void
 wimlib_global_cleanup(void)
 {
+	if (!lib_initialized)
+		return;
 	libxml_global_cleanup();
 	iconv_global_cleanup();
 #ifdef __WIN32__
@@ -1067,4 +1066,5 @@ wimlib_global_cleanup(void)
 #endif
 	cleanup_decompressor_params();
 	cleanup_compressor_params();
+	lib_initialized = false;
 }