Delay xml_update_image_info() until write

[wimlib] / src / xml.c

diff --git a/src/xml.c b/src/xml.c
index d13944a76ebd8c03492b791bb7c3c2a179a4c259..8280e8edfc496f014029d3abcb25560c5c89f100 100644 (file)
--- a/src/xml.c
+++ b/src/xml.c
@@ -716,7 +716,6 @@ xml_update_image_info(WIMStruct *wim, int image)
                xmlFreeNode(totalbytes_node);
                xmlFreeNode(hardlinkbytes_node);
                xmlFreeNode(lastmodificationtime_node);
-               WARNING("Failed to update image information!");
                return WIMLIB_ERR_NOMEM;
        }
 
@@ -809,7 +808,10 @@ xml_export_image(const struct wim_xml_info *src_info, int src_image,
 
        xmlFreeProp(unlink_index_attribute(dest_node));
 
-       return append_image_node(dest_info, dest_node);
+       ret = append_image_node(dest_info, dest_node);
+       if (ret)
+               goto err;
+       return 0;
 
 err:
        xmlFreeNode(dest_node);
@@ -920,11 +922,12 @@ print_windows_info(struct wim_xml_info *info, xmlNode *image_node)
 
                tprintf(T("Languages:              "));
                node_for_each_child(langs_node, lang_node) {
-                       if (node_is_element(lang_node, "LANGUAGE")) {
-                               tfputs(node_get_ttext(info, lang_node), stdout);
-                               tputchar(T(' '));
-                       }
-
+                       if (!node_is_element(lang_node, "LANGUAGE"))
+                               continue;
+                       text = node_get_ttext(info, lang_node);
+                       if (!text)
+                               continue;
+                       tprintf(T("%"TS" "), text);
                }
                tputchar(T('\n'));