X-Git-Url: https://wimlib.net/git/?a=blobdiff_plain;f=src%2Fxml.c;h=4617e2ab4cbd6fa8a3e1bec379ccb33e6e1fcfd7;hb=2b14c2bfd6d0a7a17433dd8529cfc8b7d969c4b0;hp=5351c2c29af190abafac32adcab216cfc73777f4;hpb=bae32f91ef1953acd7271976022491e2e5c48aa2;p=wimlib

diff --git a/src/xml.c b/src/xml.c
index 5351c2c2..4617e2ab 100644
--- a/src/xml.c
+++ b/src/xml.c
@@ -7,20 +7,18 @@
 /*
  * Copyright (C) 2012, 2013 Eric Biggers
  *
- * This file is part of wimlib, a library for working with WIM files.
+ * This file is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation; either version 3 of the License, or (at your option) any
+ * later version.
  *
- * wimlib is free software; you can redistribute it and/or modify it under the
- * terms of the GNU General Public License as published by the Free
- * Software Foundation; either version 3 of the License, or (at your option)
- * any later version.
- *
- * wimlib is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the GNU General Public License for more
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
  * details.
  *
- * You should have received a copy of the GNU General Public License
- * along with wimlib; if not, see http://www.gnu.org/licenses/.
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this file; if not, see http://www.gnu.org/licenses/.
  */
 
 #ifdef HAVE_CONFIG_H
@@ -272,21 +270,13 @@ static int
 node_get_string(const xmlNode *string_node, tchar **tstr_ret)
 {
 	xmlNode *child;
-	tchar *tstr = NULL;
-	int ret;
 
 	if (*tstr_ret)
 		return 0;
 
-	for_node_child(string_node, child) {
-		if (node_is_text(child) && child->content) {
-			ret = utf8_to_tstr_simple(child->content, &tstr);
-			if (ret)
-				return ret;
-			break;
-		}
-	}
-	*tstr_ret = tstr;
+	for_node_child(string_node, child)
+		if (node_is_text(child) && child->content)
+			return utf8_to_tstr_simple(child->content, tstr_ret);
 	return 0;
 }
 
@@ -522,7 +512,6 @@ xml_read_image_info(xmlNode *image_node, struct image_info *image_info)
 		else if (node_name_is(child, "LASTMODIFICATIONTIME"))
 			image_info->last_modification_time = node_get_timestamp(child);
 		else if (node_name_is(child, "WINDOWS")) {
-			DEBUG("Found <WINDOWS> tag");
 			ret = xml_read_windows_info(child,
 						    &image_info->windows_info);
 			image_info->windows_info_exists = true;
@@ -546,7 +535,6 @@ xml_read_image_info(xmlNode *image_node, struct image_info *image_info)
 	}
 	if (!image_info->name) {
 		tchar *empty_name;
-		/*WARNING("Image with index %d has no name", image_info->index);*/
 		empty_name = MALLOC(sizeof(tchar));
 		if (!empty_name)
 			return WIMLIB_ERR_NOMEM;
@@ -596,7 +584,6 @@ xml_read_wim_info(const xmlNode *wim_node, struct wim_info **wim_info_ret)
 			if (!node_is_element(child))
 				continue;
 			if (node_name_is(child, "IMAGE")) {
-				DEBUG("Found <IMAGE> tag");
 				ret = xml_read_image_info(child,
 							  &wim_info->images[i]);
 				if (ret != 0)
@@ -640,10 +627,7 @@ err:
 	return ret;
 }
 
-/* Prints the information contained in a `struct windows_info'.
- *
- * Warning: any strings printed here are in UTF-8 encoding.  If the locale
- * character encoding is not UTF-8, the printed strings may be garbled. */
+/* Prints the information contained in a `struct windows_info'.  */
 static void
 print_windows_info(const struct windows_info *windows_info)
 {
@@ -1257,10 +1241,7 @@ calculate_dentry_statistics(struct wim_dentry *dentry, void *arg)
 
 /*
  * Calculate what to put in the <FILECOUNT>, <DIRCOUNT>, <TOTALBYTES>, and
- * <HARDLINKBYTES> elements of each <IMAGE>.
- *
- * Please note there is no official documentation for exactly how this is done.
- * But, see calculate_dentry_statistics().
+ * <HARDLINKBYTES> elements of the specified WIM image.
  */
 void
 xml_update_image_info(WIMStruct *wim, int image)
@@ -1686,29 +1667,19 @@ wimlib_set_image_name(WIMStruct *wim, int image, const tchar *name)
 {
 	tchar *p;
 	int i;
-	int ret;
-
-	DEBUG("Setting the name of image %d to %"TS, image, name);
-
-	ret = can_modify_wim(wim);
-	if (ret)
-		return ret;
 
 	if (name == NULL)
 		name = T("");
 
-	if (image < 1 || image > wim->hdr.image_count) {
-		ERROR("%d is not a valid image", image);
+	if (image < 1 || image > wim->hdr.image_count)
 		return WIMLIB_ERR_INVALID_IMAGE;
-	}
 
-	for (i = 1; i <= wim->hdr.image_count; i++) {
-		if (i == image)
-			continue;
-		if (!tstrcmp(wim->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;
+	if (*name) {
+		for (i = 1; i <= wim->hdr.image_count; i++) {
+			if (i == image)
+				continue;
+			if (!tstrcmp(wim->wim_info->images[i - 1].name, name))
+				return WIMLIB_ERR_IMAGE_NAME_COLLISION;
 		}
 	}
 
@@ -1727,11 +1698,6 @@ do_set_image_info_str(WIMStruct *wim, int image, const tchar *tstr,
 {
 	tchar *tstr_copy;
 	tchar **dest_tstr_p;
-	int ret;
-
-	ret = can_modify_wim(wim);
-	if (ret)
-		return ret;
 
 	if (image < 1 || image > wim->hdr.image_count) {
 		ERROR("%d is not a valid image", image);