imagex.c: Remove unnecessary checks of swm_glob

[wimlib] / programs / imagex.c

diff --git a/programs/imagex.c b/programs/imagex.c
index afcf8def4815f1fcf4a3fabcb023169f9e35f9f3..0439869d225d98491f5d0e3f825633fb2c824ab5 100644 (file)
--- a/programs/imagex.c
+++ b/programs/imagex.c
@@ -1647,11 +1647,9 @@ imagex_apply(int argc, tchar **argv)
        win32_release_restore_privileges();
 #endif
 out_free_swms:
-       if (swm_glob) {
-               for (unsigned i = 0; i < num_additional_swms; i++)
-                       wimlib_free(additional_swms[i]);
-               free(additional_swms);
-       }
+       for (unsigned i = 0; i < num_additional_swms; i++)
+               wimlib_free(additional_swms[i]);
+       free(additional_swms);
 out_wimlib_free:
        wimlib_free(wim);
 out:
@@ -2264,11 +2262,9 @@ imagex_export(int argc, tchar **argv)
                ret = wimlib_overwrite(dest_wim, write_flags, num_threads,
                                       imagex_progress_func);
 out_free_swms:
-       if (swm_glob) {
-               for (unsigned i = 0; i < num_additional_swms; i++)
-                       wimlib_free(additional_swms[i]);
-               free(additional_swms);
-       }
+       for (unsigned i = 0; i < num_additional_swms; i++)
+               wimlib_free(additional_swms[i]);
+       free(additional_swms);
 out_free_dest_wim:
        wimlib_free(dest_wim);
 out_free_src_wim:
@@ -2457,11 +2453,9 @@ imagex_extract(int argc, tchar **argv)
 #ifdef __WIN32__
        win32_release_restore_privileges();
 #endif
-       if (swm_glob) {
-               for (unsigned i = 0; i < num_additional_swms; i++)
-                       wimlib_free(additional_swms[i]);
-               free(additional_swms);
-       }
+       for (unsigned i = 0; i < num_additional_swms; i++)
+               wimlib_free(additional_swms[i]);
+       free(additional_swms);
 out_wimlib_free:
        wimlib_free(wim);
 out_free_cmds:
@@ -2963,11 +2957,9 @@ imagex_mount_rw_or_ro(int argc, tchar **argv)
                               "on \"%"TS"\""),
                             image, wimfile, dir);
        }
-       if (swm_glob) {
-               for (unsigned i = 0; i < num_additional_swms; i++)
-                       wimlib_free(additional_swms[i]);
-               free(additional_swms);
-       }
+       for (unsigned i = 0; i < num_additional_swms; i++)
+               wimlib_free(additional_swms[i]);
+       free(additional_swms);
 out_free_wim:
        wimlib_free(wim);
 out:
@@ -3024,10 +3016,10 @@ imagex_optimize(int argc, tchar **argv)
        if (ret)
                goto out;
 
-       old_size = file_get_size(argv[0]);
+       old_size = file_get_size(wimfile);
        tprintf(T("\"%"TS"\" original size: "), wimfile);
        if (old_size == -1)
-               tfputs(T("Unknown\n"), stdout);
+               tputs(T("Unknown"));
        else
                tprintf(T("%"PRIu64" KiB\n"), old_size >> 10);
 
@@ -3036,10 +3028,10 @@ imagex_optimize(int argc, tchar **argv)
        if (ret)
                goto out_wimlib_free;
 
-       new_size = file_get_size(argv[0]);
+       new_size = file_get_size(wimfile);
        tprintf(T("\"%"TS"\" optimized size: "), wimfile);
        if (new_size == -1)
-               tfputs(T("Unknown\n"), stdout);
+               tputs(T("Unknown"));
        else
                tprintf(T("%"PRIu64" KiB\n"), new_size >> 10);
 
@@ -3048,7 +3040,7 @@ imagex_optimize(int argc, tchar **argv)
                tprintf(T("%lld KiB\n"),
                       ((long long)old_size - (long long)new_size) >> 10);
        } else {
-               tfputs(T("Unknown\n"), stdout);
+               tputs(T("Unknown"));
        }
        ret = 0;
 out_wimlib_free:
@@ -3068,7 +3060,7 @@ static int
 imagex_split(int argc, tchar **argv)
 {
        int c;
-       int open_flags = WIMLIB_OPEN_FLAG_SPLIT_OK;
+       int open_flags = 0;
        int write_flags = 0;
        unsigned long part_size;
        tchar *tmp;