Windows: improved error messages

[wimlib] / src / xml.c

diff --git a/src/xml.c b/src/xml.c
index 4617e2ab4cbd6fa8a3e1bec379ccb33e6e1fcfd7..22966e0e466d7b7f5560ce7a32abba30f1c05294 100644 (file)
--- a/src/xml.c
+++ b/src/xml.c
@@ -25,6 +25,13 @@
 #  include "config.h"
 #endif
 
+#include <libxml/encoding.h>
+#include <libxml/parser.h>
+#include <libxml/tree.h>
+#include <libxml/xmlwriter.h>
+#include <string.h>
+
+#include "wimlib/assert.h"
 #include "wimlib/dentry.h"
 #include "wimlib/encoding.h"
 #include "wimlib/error.h"
@@ -36,14 +43,6 @@
 #include "wimlib/xml.h"
 #include "wimlib/write.h"
 
-#include <libxml/encoding.h>
-#include <libxml/parser.h>
-#include <libxml/tree.h>
-#include <libxml/xmlwriter.h>
-#include <limits.h>
-#include <string.h>
-#include <unistd.h>
-
 /* Structures used to form an in-memory representation of the XML data (other
  * than the raw parse tree from libxml). */
 
@@ -490,7 +489,7 @@ xml_read_image_info(xmlNode *image_node, struct image_info *image_info)
        index_prop = xmlGetProp(image_node, "INDEX");
        if (index_prop) {
                image_info->index = atoi(index_prop);
-               FREE(index_prop);
+               xmlFree(index_prop);
        } else {
                image_info->index = 1;
        }
@@ -1261,7 +1260,7 @@ xml_update_image_info(WIMStruct *wim, int image)
        for_dentry_in_tree(wim->image_metadata[image - 1]->root_dentry,
                           calculate_dentry_statistics,
                           image_info);
-       image_info->last_modification_time = get_wim_timestamp();
+       image_info->last_modification_time = now_as_wim_timestamp();
 }
 
 /* Adds an image to the XML information. */
@@ -1292,7 +1291,7 @@ xml_add_image(WIMStruct *wim, const tchar *name)
 
        wim->wim_info = wim_info;
        image_info->index = wim_info->num_images;
-       image_info->creation_time = get_wim_timestamp();
+       image_info->creation_time = now_as_wim_timestamp();
        xml_update_image_info(wim, image_info->index);
        return 0;