Encodings update (IN PROGRESS)

[wimlib] / src / join.c

diff --git a/src/join.c b/src/join.c
index f6b8d2ca882eb96ebcb872b0618f64cf70065ac9..2902a61cae68c86acc5fb134f327a982b2cb3403 100644 (file)
--- 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,16 +28,17 @@
 #include "xml.h"
 #include <stdlib.h>
 
-static int move_lte_to_table(struct wim_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 wim_lookup_table*)other_tab, lte);
        return 0;
 }
 
-static int lookup_table_join(struct wim_lookup_table *table,
-                            struct wim_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);
 }
@@ -56,10 +57,11 @@ static int lookup_table_join(struct wim_lookup_table *table,
  * 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 wim_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 wim_lookup_table *table;
        int ret;
@@ -85,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;
@@ -115,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;
                }
@@ -150,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;
@@ -160,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;