Add wimlib_global_{init,cleanup}()

[wimlib] / programs / imagex.c

diff --git a/programs/imagex.c b/programs/imagex.c
index 30c2e3e8b289e9cd6b4995dfd0d9332e2a3f2814..358e2d12a98801107350c81794f6466103eebc89 100644 (file)
--- a/programs/imagex.c
+++ b/programs/imagex.c
@@ -1011,7 +1011,7 @@ static int imagex_export(int argc, const char **argv)
 
                ret = file_writable(dest_wimfile);
                if (ret != 0)
-                       return ret;
+                       goto out;
 
                dest_ctype = wimlib_get_compression_type(dest_w);
                if (compression_type_specified
@@ -1489,7 +1489,7 @@ static int imagex_mount_rw_or_ro(int argc, const char **argv)
        if (mount_flags & WIMLIB_MOUNT_FLAG_READWRITE) {
                ret = file_writable(wimfile);
                if (ret != 0)
-                       return ret;
+                       goto out;
        }
 
        ret = wimlib_mount_image(w, image, dir, mount_flags, additional_swms,
@@ -1779,22 +1779,28 @@ int main(int argc, const char **argv)
        argv++;
 
        wimlib_set_print_errors(true);
+       ret = wimlib_global_init();
+       if (ret)
+               goto out;
 
        for_imagex_command(cmd) {
                if (strcmp(cmd->name, *argv) == 0) {
                        ret = cmd->func(argc, argv);
-                       if (ret > 0) {
-                               imagex_error("Exiting with error code %d:\n"
-                                            "       %s.", ret,
-                                            wimlib_get_error_string(ret));
-                               if (ret == WIMLIB_ERR_NTFS_3G && errno != 0)
-                                       imagex_error_with_errno("errno");
-                       }
-                       return ret;
+                       goto out;
                }
        }
 
        imagex_error("Unrecognized command: `%s'", argv[0]);
        usage_all();
        return 1;
+out:
+       if (ret > 0) {
+               imagex_error("Exiting with error code %d:\n"
+                            "       %s.", ret,
+                            wimlib_get_error_string(ret));
+               if (ret == WIMLIB_ERR_NTFS_3G && errno != 0)
+                       imagex_error_with_errno("errno");
+       }
+       wimlib_global_cleanup();
+       return ret;
 }