*/
/*
- * Copyright (C) 2012 Eric Biggers
+ * Copyright (C) 2012, 2013 Eric Biggers
*
* This file is part of wimlib, a library for working with WIM files.
*
#include "xml.h"
#include <stdlib.h>
-static int move_lte_to_table(struct lookup_table_entry *lte,
- void *other_tab)
+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);
}
/*
- * 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.
* 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)
+int
+new_joined_lookup_table(WIMStruct *w,
+ WIMStruct **additional_swms,
+ unsigned num_additional_swms,
+ struct wim_lookup_table **table_ret)
{
- struct lookup_table *table;
+ struct wim_lookup_table *table;
int ret;
unsigned i;
}
-static int join_wims(WIMStruct **swms, unsigned num_swms,
- WIMStruct *joined_wim, int write_flags,
- wimlib_progress_func_t progress_func)
+static int
+join_wims(WIMStruct **swms, unsigned num_swms,
+ WIMStruct *joined_wim, int write_flags,
+ wimlib_progress_func_t progress_func)
{
int ret;
unsigned i;
* part */
swms[0]->write_metadata = true;
for (i = 0; i < num_swms; i++) {
- swms[i]->fp = fopen(swms[i]->filename, "rb");
+ swms[i]->fp = tfopen(swms[i]->filename, T("rb"));
if (!swms[i]->fp) {
- ERROR_WITH_ERRNO("Failed to reopen `%s'",
+ ERROR_WITH_ERRNO("Failed to reopen `%"TS"'",
swms[i]->filename);
return WIMLIB_ERR_OPEN;
}
return ret;
}
-static int cmp_swms_by_part_number(const void *swm1, const void *swm2)
+static int
+cmp_swms_by_part_number(const void *swm1, const void *swm2)
{
u16 partno_1 = (*(const WIMStruct**)swm1)->hdr.part_number;
u16 partno_2 = (*(const WIMStruct**)swm2)->hdr.part_number;
/*
* Join a set of split WIMs into a stand-alone WIM.
*/
-WIMLIBAPI int wimlib_join(const char **swm_names, unsigned num_swms,
- const char *output_path, int swm_open_flags,
- int wim_write_flags,
- wimlib_progress_func_t progress_func)
+WIMLIBAPI int
+wimlib_join(const tchar * const *swm_names,
+ unsigned num_swms,
+ const tchar *output_path,
+ int swm_open_flags,
+ int wim_write_flags,
+ wimlib_progress_func_t progress_func)
{
int ret;
WIMStruct *joined_wim = NULL;