X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=src%2Fjoin.c;h=054e347d8aa569246f69b27a2c6b8d1db3ff2eb6;hp=34e5df91ab4e694b8585fdc5d9a820b149110cf6;hb=36a737d734cdc6c6eb0ce9da3183a1f8fa4288e6;hpb=9b9a502863318d6208da2818b1d522346e5eee9e

diff --git a/src/join.c b/src/join.c
index 34e5df91..054e347d 100644
--- a/src/join.c
+++ b/src/join.c
@@ -42,107 +42,6 @@ static int lookup_table_join(struct lookup_table *table,
 	return for_lookup_table_entry(new, move_lte_to_table, table);
 }
 
-/*
- * Sanity checks to make sure a set of WIMs correctly correspond to a spanned
- * set.
- *
- * @w:
- * 	Part 1 of the set.
- *
- * @additional_swms:
- * 	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.
- *
- * @return:
- * 	0 on success; WIMLIB_ERR_SPLIT_INVALID if the set is not valid.
- */
-int verify_swm_set(WIMStruct *w, WIMStruct **additional_swms,
-		   unsigned num_additional_swms)
-{
-	unsigned total_parts = w->hdr.total_parts;
-	int ctype;
-	const u8 *guid;
-
-	if (total_parts != num_additional_swms + 1) {
-		ERROR("`%s' says there are %u parts in the spanned set, "
-		      "but %s%u part%s provided",
-		      w->filename, total_parts,
-		      (num_additional_swms + 1 < total_parts) ? "only " : "",
-		      num_additional_swms + 1,
-		      (num_additional_swms) ? "s were" : " was");
-		return WIMLIB_ERR_SPLIT_INVALID;
-	}
-	if (w->hdr.part_number != 1) {
-		ERROR("WIM `%s' is not the first part of the split WIM.",
-		      w->filename);
-		return WIMLIB_ERR_SPLIT_INVALID;
-	}
-	for (unsigned i = 0; i < num_additional_swms; i++) {
-		if (additional_swms[i]->hdr.total_parts != total_parts) {
-			ERROR("WIM `%s' says there are %u parts in the spanned set, "
-			      "but %u parts were provided",
-			      additional_swms[i]->filename,
-			      additional_swms[i]->hdr.total_parts,
-			      total_parts);
-			return WIMLIB_ERR_SPLIT_INVALID;
-		}
-	}
-
-	/* keep track of ctype and guid just to make sure they are the same for
-	 * all the WIMs. */
-	ctype = wimlib_get_compression_type(w);
-	guid = w->hdr.guid;
-
-	WIMStruct *parts_to_swms[num_additional_swms];
-	ZERO_ARRAY(parts_to_swms);
-	for (unsigned i = 0; i < num_additional_swms; i++) {
-
-		WIMStruct *swm = additional_swms[i];
-
-		if (wimlib_get_compression_type(swm) != ctype) {
-			ERROR("The split WIMs do not all have the same "
-			      "compression type");
-			return WIMLIB_ERR_SPLIT_INVALID;
-		}
-		if (memcmp(guid, swm->hdr.guid, WIM_GID_LEN) != 0) {
-			ERROR("The split WIMs do not all have the same "
-			      "GUID");
-			return WIMLIB_ERR_SPLIT_INVALID;
-		}
-		if (swm->hdr.part_number == 1) {
-			ERROR("WIMs `%s' and `%s' both are marked as the "
-			      "first WIM in the spanned set",
-			      w->filename, swm->filename);
-			return WIMLIB_ERR_SPLIT_INVALID;
-		}
-		if (swm->hdr.part_number == 0 ||
-		    swm->hdr.part_number > total_parts)
-		{
-			ERROR("WIM `%s' says it is part %u in the spanned set, "
-			      "but the part number must be in the range "
-			      "[1, %u]",
-			      swm->filename, swm->hdr.part_number, total_parts);
-			return WIMLIB_ERR_SPLIT_INVALID;
-		}
-		if (parts_to_swms[swm->hdr.part_number - 2])
-		{
-			ERROR("`%s' and `%s' are both marked as part %u of %u "
-			      "in the spanned set",
-			      parts_to_swms[swm->hdr.part_number - 2]->filename,
-			      swm->filename,
-			      swm->hdr.part_number,
-			      total_parts);
-			return WIMLIB_ERR_SPLIT_INVALID;
-		} else {
-			parts_to_swms[swm->hdr.part_number - 2] = swm;
-		}
-	}
-	return 0;
-}
-
 /*
  * Joins lookup tables from the parts of a split WIM.
  *