write.c: Do not raw-copy packed resources

[wimlib] / src / xml.c

diff --git a/src/xml.c b/src/xml.c
index 4a8bda9a56d0c5a99ce76f7cb81541bab1beea94..5103d75d8d34d01901cf6505fc05950b98b4ad14 100644 (file)
--- a/src/xml.c
+++ b/src/xml.c
@@ -690,7 +690,7 @@ xml_write_strings_from_specs(xmlTextWriter *writer,
        for (size_t i = 0; i < num_specs; i++) {
                int rc = xml_write_string(writer, specs[i].name,
                                      *(const tchar * const *)
-                                       (struct_with_strings + specs[i].offset));
+                                       (struct_with_strings + specs[i].offset));
                if (rc)
                        return rc;
        }
@@ -1092,7 +1092,6 @@ xml_get_max_image_name_len(const WIMStruct *wim)
        return max_len;
 }
 
-#ifdef ENABLE_CUSTOM_MEMORY_ALLOCATOR
 void
 xml_set_memory_allocator(void *(*malloc_func)(size_t),
                         void (*free_func)(void *),
@@ -1100,7 +1099,6 @@ xml_set_memory_allocator(void *(*malloc_func)(size_t),
 {
        xmlMemSetup(free_func, malloc_func, realloc_func, STRDUP);
 }
-#endif
 
 static int
 calculate_dentry_statistics(struct wim_dentry *dentry, void *arg)
@@ -1521,10 +1519,9 @@ write_wim_xml_data(WIMStruct *wim, int image, u64 total_bytes,
                                             0,
                                             out_reshdr,
                                             NULL,
-                                            write_resource_flags,
-                                            &wim->lzx_context);
+                                            write_resource_flags);
        FREE(xml_data);
-       DEBUG("ret=%d");
+       DEBUG("ret=%d", ret);
        return ret;
 }