X-Git-Url: https://wimlib.net/git/?a=blobdiff_plain;f=src%2Fjoin.c;h=2902a61cae68c86acc5fb134f327a982b2cb3403;hb=f2db311f527e6037c836cf1b14debb841e09b440;hp=054e347d8aa569246f69b27a2c6b8d1db3ff2eb6;hpb=fea0ee9f10fbcb85ff56ca06510e96186a7611ae;p=wimlib

diff --git a/src/join.c b/src/join.c
index 054e347d..2902a61c 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,22 +28,23 @@
 #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(&lte->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.
@@ -53,18 +54,16 @@ static int lookup_table_join(struct lookup_table *table,
  * 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;
 
@@ -88,9 +87,10 @@ out_free_table:
 }
 
 
-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;
@@ -118,9 +118,9 @@ static int join_wims(WIMStruct **swms, unsigned num_swms,
 	 * 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;
 		}
@@ -153,7 +153,8 @@ static int join_wims(WIMStruct **swms, unsigned num_swms,
 	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;
@@ -163,10 +164,13 @@ 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,
-			  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;