#include "wimlib/dentry.h"
#include "wimlib/encoding.h"
-#include "wimlib/metadata.h"
#include "wimlib/error.h"
#include "wimlib/file_io.h"
#include "wimlib/lookup_table.h"
+#include "wimlib/metadata.h"
#include "wimlib/resource.h"
#include "wimlib/timestamp.h"
#include "wimlib/xml.h"
}
if (!image_info->name) {
tchar *empty_name;
- WARNING("Image with index %d has no name", image_info->index);
+ /*WARNING("Image with index %d has no name", image_info->index);*/
empty_name = MALLOC(sizeof(tchar));
if (!empty_name)
return WIMLIB_ERR_NOMEM;
return ret;
}
-#define CHECK_RET ({ if (ret < 0) { \
- ERROR("Error writing XML data"); \
- ret = WIMLIB_ERR_WRITE; \
- goto out_free_text_writer; \
- } })
-
/*
* Writes XML data to a WIM file.
*
DEBUG("Writing <WIM> element");
ret = xmlTextWriterStartElement(writer, "WIM");
- CHECK_RET;
+ if (ret < 0)
+ goto out_write_error;
ret = xmlTextWriterWriteFormatElement(writer, "TOTALBYTES", "%"PRIu64,
total_bytes);
- CHECK_RET;
+ if (ret < 0)
+ goto out_write_error;
if (wim_info != NULL) {
int first, last;
for (int i = first; i <= last; i++) {
ret = xml_write_image_info(writer, &wim_info->images[i - 1]);
if (ret) {
- CHECK_RET;
+ if (ret < 0)
+ goto out_write_error;
goto out_free_text_writer;
}
}
}
ret = xmlTextWriterEndElement(writer);
- CHECK_RET;
+ if (ret < 0)
+ goto out_write_error;
ret = xmlTextWriterEndDocument(writer);
- CHECK_RET;
+ if (ret < 0)
+ goto out_write_error;
+
+ ret = xmlTextWriterFlush(writer);
+ if (ret < 0)
+ goto out_write_error;
DEBUG("Ended XML document");
out_free_text_writer:
/* xmlFreeTextWriter will free the attached xmlOutputBuffer. */
xmlFreeTextWriter(writer);
- out_buffer = NULL;
+ goto out;
out_output_buffer_close:
- if (out_buffer != NULL)
- xmlOutputBufferClose(out_buffer);
+ xmlOutputBufferClose(out_buffer);
out:
if (ret == 0)
DEBUG("Successfully wrote XML data");
return ret;
+out_write_error:
+ ERROR("Error writing XML data");
+ ret = WIMLIB_ERR_WRITE;
+ goto out_free_text_writer;
}
/* Returns the name of the specified image. */
{
tchar *p;
int i;
+ int ret;
DEBUG("Setting the name of image %d to %"TS, image, name);
- if (!name || !*name) {
- ERROR("Must specify a non-empty string for the image name");
- return WIMLIB_ERR_INVALID_PARAM;
- }
+ ret = can_modify_wim(w);
+ if (ret)
+ return ret;
+
+ if (name == NULL)
+ name = T("");
if (image < 1 || image > w->hdr.image_count) {
ERROR("%d is not a valid image", image);
for (i = 1; i <= w->hdr.image_count; i++) {
if (i == image)
continue;
- if (tstrcmp(w->wim_info->images[i - 1].name, name) == 0) {
+ if (!tstrcmp(w->wim_info->images[i - 1].name, name)) {
ERROR("The name \"%"TS"\" is already in use in the WIM!",
name);
return WIMLIB_ERR_IMAGE_NAME_COLLISION;
{
tchar *tstr_copy;
tchar **dest_tstr_p;
+ int ret;
+
+ ret = can_modify_wim(w);
+ if (ret)
+ return ret;
if (image < 1 || image > w->hdr.image_count) {
ERROR("%d is not a valid image", image);