}
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;
{
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);