* correspond to a spanned set.
*
* @wim:
- * Part 1 of the set.
+ * Part 1 of the set.
*
* @additional_swms:
- * All parts of the set other than part 1.
+ * All parts of the set other than part 1.
*
* @num_additional_swms:
- * Number of WIMStructs in @additional_swms. Or, the total number of parts
- * in the set minus 1.
+ * Number of WIMStructs in @additional_swms. Or, the total number of parts
+ * in the set minus 1.
*
* @return:
- * 0 on success; WIMLIB_ERR_SPLIT_INVALID if the set is not valid.
+ * 0 on success; WIMLIB_ERR_SPLIT_INVALID if the set is not valid.
*/
static int
verify_swm_set(WIMStruct *wim, WIMStruct **additional_swms,
"chunk size");
return WIMLIB_ERR_SPLIT_INVALID;
}
- if (memcmp(guid, swm->hdr.guid, WIM_GID_LEN) != 0) {
+ if (memcmp(guid, swm->hdr.guid, WIM_GUID_LEN) != 0) {
ERROR("The split WIMs do not all have the same "
"GUID");
return WIMLIB_ERR_SPLIT_INVALID;
return WIMLIB_ERR_INVALID_PARAM;
num_additional_swms = num_swms - 1;
- additional_swms = CALLOC(num_additional_swms, sizeof(additional_swms[0]));
+ additional_swms = CALLOC((num_additional_swms + 1),
+ sizeof(additional_swms[0]));
if (!additional_swms)
return WIMLIB_ERR_NOMEM;
}
if (!swm0) {
+ ERROR("Part 1 of the split WIM was not specified!");
ret = WIMLIB_ERR_SPLIT_INVALID;
goto out_free_swms;
}
* have verified that the specified split WIM parts form a spanned set.
*/
ret = wimlib_write(swm0, output_path, WIMLIB_ALL_IMAGES,
- wim_write_flags | WIMLIB_WRITE_FLAG_STREAMS_OK,
+ wim_write_flags |
+ WIMLIB_WRITE_FLAG_STREAMS_OK |
+ WIMLIB_WRITE_FLAG_RETAIN_GUID,
1, progress_func);
out_free_swms:
- for (i = 0; i < num_additional_swms; i++)
+ for (i = 0; i < num_additional_swms + 1; i++)
wimlib_free(additional_swms[i]);
FREE(additional_swms);
wimlib_free(swm0);