Miscellaneous fixes and cleanups

[wimlib] / src / wim.c

diff --git a/src/wim.c b/src/wim.c
index 9ddaddbeab35cdee1e0a8a2f7d90def0c84dec68..bf382a6413205c67debe283dafff3d419f60e26e 100644 (file)
--- a/src/wim.c
+++ b/src/wim.c
@@ -869,10 +869,10 @@ wimlib_free(WIMStruct *wim)
 
        if (!wim)
                return;
-       if (wim->in_fd.fd != -1)
-               close(wim->in_fd.fd);
-       if (wim->out_fd.fd != -1)
-               close(wim->out_fd.fd);
+       if (filedes_valid(&wim->in_fd))
+               filedes_close(&wim->in_fd);
+       if (filedes_valid(&wim->out_fd))
+               filedes_close(&wim->out_fd);
 
        free_lookup_table(wim->lookup_table);
 
@@ -919,7 +919,7 @@ wimlib_global_init(int init_flags)
        #endif
        }
 #ifdef __WIN32__
-       win32_global_init();
+       win32_global_init(init_flags);
 #endif
        already_inited = true;
        return 0;