#include "xml.h"
#include "timestamp.h"
#include <string.h>
-
+#include <time.h>
#include <libxml/parser.h>
#include <libxml/tree.h>
#include <libxml/xmlwriter.h>
&image_info->total_bytes,
&image_info->hard_link_bytes);
- image_info->last_modification_time = get_timestamp();
+ image_info->last_modification_time = get_wim_timestamp();
}
/* Adds an image to the XML information. */
w->wim_info = wim_info;
image_info->index = wim_info->num_images;
- image_info->creation_time = get_timestamp();
+ image_info->creation_time = get_wim_timestamp();
xml_update_image_info(w, image_info->index);
return 0;
printf("Hard Link Bytes: %"PRIu64"\n",
image_info->hard_link_bytes);
- ctime = ms_timestamp_to_unix(image_info->creation_time);
- mtime = ms_timestamp_to_unix(image_info->last_modification_time);
+ ctime = wim_timestamp_to_unix(image_info->creation_time);
+ mtime = wim_timestamp_to_unix(image_info->last_modification_time);
printf("Creation Time: %s", asctime(localtime(&ctime)));
printf("Last Modification Time: %s", asctime(localtime(&mtime)));
if (resource_is_compressed(res)) {
ERROR("XML data is supposed to be uncompressed");
ret = WIMLIB_ERR_XML;
- goto err0;
+ goto out_cleanup_parser;
}
if (res->size < 2) {
ERROR("XML data must be at least 2 bytes");
ret = WIMLIB_ERR_XML;
- goto err0;
+ goto out_cleanup_parser;
}
xml_data = MALLOC(res->size + 2);
if (!xml_data) {
ret = WIMLIB_ERR_NOMEM;
- goto err0;
+ goto out_cleanup_parser;
}
- ret = read_full_resource(fp, res->size, res->size, res->offset,
- WIM_COMPRESSION_TYPE_NONE, xml_data);
+ ret = read_uncompressed_resource(fp, res->offset, res->size, xml_data);
if (ret != 0)
- goto err1;
+ goto out_free_xml_data;
xml_data[res->size] = 0;
xml_data[res->size + 1] = 0;
if (!doc) {
ERROR("Failed to parse XML data");
ret = WIMLIB_ERR_XML;
- goto err1;
+ goto out_free_xml_data;
}
DEBUG("Constructing WIM information structure from XML tree.");
if (!root) {
ERROR("Empty XML document");
ret = WIMLIB_ERR_XML;
- goto err2;
+ goto out_free_doc;
}
if (!node_is_element(root) || !node_name_is(root, "WIM")) {
ERROR("Expected <WIM> for the root XML element (found <%s>)",
root->name);
ret = WIMLIB_ERR_XML;
- goto err2;
+ goto out_free_doc;
}
ret = xml_read_wim_info(root, info_ret);
if (ret != 0)
- goto err2;
+ goto out_free_doc;
DEBUG("Freeing XML tree.");
xmlCleanupParser();
*xml_data_ret = xml_data;
return 0;
-err2:
+out_free_doc:
xmlFreeDoc(doc);
-err1:
+out_free_xml_data:
FREE(xml_data);
-err0:
+out_cleanup_parser:
xmlCleanupParser();
return ret;
}