From: Eric Biggers <ebiggers3@gmail.com>
Date: Fri, 7 Nov 2014 00:44:54 +0000 (-0600)
Subject: wimlib_set_image_name(): Allow multiple images with empty name
X-Git-Tag: v1.7.3~4
X-Git-Url: https://wimlib.net/git/?p=wimlib;a=commitdiff_plain;h=b29b7590567518adf07b08ba73d32cb4a975147a;hp=b9a8ffb8938df0f58b34aef1cc57f083f28c82db

wimlib_set_image_name(): Allow multiple images with empty name
---

diff --git a/src/xml.c b/src/xml.c
index ecb73b22..cdd974eb 100644
--- a/src/xml.c
+++ b/src/xml.c
@@ -1668,23 +1668,18 @@ wimlib_set_image_name(WIMStruct *wim, int image, const tchar *name)
 	tchar *p;
 	int i;
 
-	DEBUG("Setting the name of image %d to %"TS, image, name);
-
 	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;
 		}
 	}