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:
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:
#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:
"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:
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);
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);
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:
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;