Encodings update (IN PROGRESS)

[wimlib] / src / export_image.c

diff --git a/src/export_image.c b/src/export_image.c
index 1cbb52d74d53b573dfaff0cfd345ca0d427785ea..dfd9f058ffdd344a39022e0e44c4b8a5f20f982d 100644 (file)
--- a/src/export_image.c
+++ b/src/export_image.c
@@ -3,7 +3,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.
  *
@@ -95,8 +95,8 @@ static void inode_move_ltes_to_table(struct wim_inode *inode,
 WIMLIBAPI int wimlib_export_image(WIMStruct *src_wim,
                                  int src_image,
                                  WIMStruct *dest_wim,
-                                 const char *dest_name,
-                                 const char *dest_description,
+                                 const tchar *dest_name,
+                                 const tchar *dest_description,
                                  int export_flags,
                                  WIMStruct **additional_swms,
                                  unsigned num_additional_swms,
@@ -105,7 +105,7 @@ WIMLIBAPI int wimlib_export_image(WIMStruct *src_wim,
        int ret;
        struct wim_security_data *sd;
        struct wim_lookup_table *joined_tab, *src_wim_tab_save;
-       struct image_metadata *src_imd;
+       struct wim_image_metadata *src_imd;
        struct hlist_node *cur_node;
        struct list_head lte_list_head;
        struct wim_inode *inode;
@@ -165,21 +165,21 @@ WIMLIBAPI int wimlib_export_image(WIMStruct *src_wim,
 
        if (!dest_name) {
                dest_name = wimlib_get_image_name(src_wim, src_image);
-               DEBUG("Using name `%s' for source image %d",
+               DEBUG("Using name `%"TS"' for source image %d",
                      dest_name, src_image);
        }
 
        if (!dest_description) {
                dest_description = wimlib_get_image_description(src_wim,
                                                                src_image);
-               DEBUG("Using description `%s' for source image %d",
+               DEBUG("Using description `%"TS"' for source image %d",
                      dest_description, src_image);
        }
 
-       DEBUG("Exporting image %d from `%s'", src_image, src_wim->filename);
+       DEBUG("Exporting image %d from `%"TS"'", src_image, src_wim->filename);
 
        if (wimlib_image_name_in_use(dest_wim, dest_name)) {
-               ERROR("There is already an image named `%s' in the "
+               ERROR("There is already an image named `%"TS"' in the "
                      "destination WIM", dest_name);
                return WIMLIB_ERR_IMAGE_NAME_COLLISION;
        }
@@ -200,7 +200,7 @@ WIMLIBAPI int wimlib_export_image(WIMStruct *src_wim,
 
        ret = select_wim_image(src_wim, src_image);
        if (ret != 0) {
-               ERROR("Could not select image %d from the WIM `%s' "
+               ERROR("Could not select image %d from the WIM `%"TS"' "
                      "to export it", src_image, src_wim->filename);
                goto out;
        }