X-Git-Url: https://wimlib.net/git/?a=blobdiff_plain;f=src%2Fjoin.c;h=4d059050537c071e4813ee94732a5dc90f74f20a;hb=b5d427e440402aff987a060ff6ceefcb97117fa4;hp=34e5df91ab4e694b8585fdc5d9a820b149110cf6;hpb=9b9a502863318d6208da2818b1d522346e5eee9e;p=wimlib diff --git a/src/join.c b/src/join.c index 34e5df91..4d059050 100644 --- a/src/join.c +++ b/src/join.c @@ -5,7 +5,7 @@ */ /* - * Copyright (C) 2012 Eric Biggers + * Copyright (C) 2012, 2013 Eric Biggers * * This file is part of wimlib, a library for working with WIM files. * @@ -28,123 +28,22 @@ #include "xml.h" #include -static int move_lte_to_table(struct lookup_table_entry *lte, +static int move_lte_to_table(struct wim_lookup_table_entry *lte, void *other_tab) { hlist_del(<e->hash_list); - lookup_table_insert((struct lookup_table*)other_tab, lte); + lookup_table_insert((struct wim_lookup_table*)other_tab, lte); return 0; } -static int lookup_table_join(struct lookup_table *table, - struct lookup_table *new) +static int lookup_table_join(struct wim_lookup_table *table, + struct wim_lookup_table *new) { 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. + * new_joined_lookup_table: - Join lookup tables from the parts of a split WIM. * * @w specifies the first part, while @additional_swms and @num_additional_swms * specify an array of pointers to the WIMStruct's for additional split WIM parts. @@ -154,18 +53,15 @@ int verify_swm_set(WIMStruct *w, WIMStruct **additional_swms, * On success, 0 is returned on a pointer to the joined lookup table is returned * in @table_ret. * - * The reason we join the lookup tables is so: - * - We only have to search one lookup table to find the location of a - * resource in the entire split WIM. - * - Each lookup table entry will have a pointer to its split WIM part (and - * a part number field, although we don't really use it). + * The reason we join the lookup tables is so we only have to search one lookup + * table to find the location of a resource in the entire WIM. */ int new_joined_lookup_table(WIMStruct *w, WIMStruct **additional_swms, unsigned num_additional_swms, - struct lookup_table **table_ret) + struct wim_lookup_table **table_ret) { - struct lookup_table *table; + struct wim_lookup_table *table; int ret; unsigned i; @@ -264,7 +160,7 @@ static int cmp_swms_by_part_number(const void *swm1, const void *swm2) /* * Join a set of split WIMs into a stand-alone WIM. */ -WIMLIBAPI int wimlib_join(const char **swm_names, unsigned num_swms, +WIMLIBAPI int wimlib_join(const char * const *swm_names, unsigned num_swms, const char *output_path, int swm_open_flags, int wim_write_flags, wimlib_progress_func_t progress_func)