X-Git-Url: https://wimlib.net/git/?a=blobdiff_plain;f=src%2Fadd_image.c;h=b4eb0a9eda46de114a0a04b266b6ab3ee13f1b32;hb=a4123fea556d6c362318212127e25846981ea190;hp=e2106c9ba5fa8ba8cd7f8952ed956d1d1c15265b;hpb=d8af927e5d02cbcfc45cd1a3568b31c9814ec6f5;p=wimlib diff --git a/src/add_image.c b/src/add_image.c index e2106c9b..b4eb0a9e 100644 --- a/src/add_image.c +++ b/src/add_image.c @@ -49,7 +49,6 @@ add_empty_image_metadata(WIMStruct *wim) goto out; metadata_blob->refcnt = 1; - metadata_blob->unhashed = 1; metadata_blob->is_metadata = 1; /* Create empty security data (no security descriptors). */ @@ -66,7 +65,6 @@ add_empty_image_metadata(WIMStruct *wim) imd->root_dentry = NULL; imd->metadata_blob = metadata_blob; imd->security_data = sd; - imd->modified = 1; /* Append as next image index. */ ret = append_image_metadata(wim, imd); @@ -88,9 +86,6 @@ wimlib_add_empty_image(WIMStruct *wim, const tchar *name, int *new_idx_ret) { int ret; - if (!name) - name = T(""); - if (wimlib_image_name_in_use(wim, name)) { ERROR("There is already an image named \"%"TS"\" in the WIM!", name); @@ -101,7 +96,7 @@ wimlib_add_empty_image(WIMStruct *wim, const tchar *name, int *new_idx_ret) if (ret) return ret; - ret = xml_add_image(wim, name); + ret = xml_add_image(wim->xml_info, name); if (ret) { put_image_metadata(wim->image_metadata[--wim->hdr.image_count], NULL); @@ -180,14 +175,17 @@ wimlib_add_image_multisource(WIMStruct *wim, if (ret) goto out_delete_image; + /* If requested, mark the new image as WIMBoot-compatible. */ + if (add_flags & WIMLIB_ADD_FLAG_WIMBOOT) { + ret = xml_set_wimboot(wim->xml_info, wim->hdr.image_count); + if (ret) + goto out_delete_image; + } + /* If requested, set this image as the WIM's bootable image. */ if (add_flags & WIMLIB_ADD_FLAG_BOOT) wim->hdr.boot_idx = wim->hdr.image_count; - /* If requested, mark new image as WIMBoot-compatible. */ - if (add_flags & WIMLIB_ADD_FLAG_WIMBOOT) - wim_info_set_wimboot(wim->wim_info, wim->hdr.image_count, true); - return 0; out_delete_image: