WIMBoot / system compression: try WOFADK in addition to WOF

[wimlib] / src / add_image.c

diff --git a/src/add_image.c b/src/add_image.c
index 0aed1deb3a11d5ce2bd868783b641f32f8672742..e2106c9ba5fa8ba8cd7f8952ed956d1d1c15265b 100644 (file)
--- a/src/add_image.c
+++ b/src/add_image.c
@@ -24,8 +24,8 @@
 #endif
 
 #include "wimlib.h"
+#include "wimlib/blob_table.h"
 #include "wimlib/error.h"
-#include "wimlib/lookup_table.h"
 #include "wimlib/metadata.h"
 #include "wimlib/security.h"
 #include "wimlib/xml.h"
@@ -38,24 +38,24 @@ static int
 add_empty_image_metadata(WIMStruct *wim)
 {
        int ret;
-       struct wim_lookup_table_entry *metadata_lte;
+       struct blob_descriptor *metadata_blob;
        struct wim_security_data *sd;
        struct wim_image_metadata *imd;
 
-       /* Create lookup table entry for this metadata resource (for now really
-        * just a dummy entry).  */
+       /* Create a blob descriptor for the new metadata resource.  */
        ret = WIMLIB_ERR_NOMEM;
-       metadata_lte = new_lookup_table_entry();
-       if (!metadata_lte)
+       metadata_blob = new_blob_descriptor();
+       if (!metadata_blob)
                goto out;
 
-       metadata_lte->flags = WIM_RESHDR_FLAG_METADATA;
-       metadata_lte->unhashed = 1;
+       metadata_blob->refcnt = 1;
+       metadata_blob->unhashed = 1;
+       metadata_blob->is_metadata = 1;
 
        /* Create empty security data (no security descriptors).  */
        sd = new_wim_security_data();
        if (!sd)
-               goto out_free_metadata_lte;
+               goto out_free_metadata_blob;
 
        imd = new_image_metadata();
        if (!imd)
@@ -64,7 +64,7 @@ add_empty_image_metadata(WIMStruct *wim)
        /* A NULL root_dentry indicates a completely empty image, without even a
         * root directory.  */
        imd->root_dentry = NULL;
-       imd->metadata_lte = metadata_lte;
+       imd->metadata_blob = metadata_blob;
        imd->security_data = sd;
        imd->modified = 1;
 
@@ -76,8 +76,8 @@ add_empty_image_metadata(WIMStruct *wim)
 
 out_free_security_data:
        free_wim_security_data(sd);
-out_free_metadata_lte:
-       free_lookup_table_entry(metadata_lte);
+out_free_metadata_blob:
+       free_blob_descriptor(metadata_blob);
 out:
        return ret;
 }
@@ -191,14 +191,8 @@ wimlib_add_image_multisource(WIMStruct *wim,
        return 0;
 
 out_delete_image:
-       /* Unsuccessful; rollback the WIM to its original state.  */
-
-       /* wimlib_update_image() is now all-or-nothing, so no dentries remain
-        * and there's no need to pass the lookup table here.  */
-       put_image_metadata(wim->image_metadata[wim->hdr.image_count - 1], NULL);
-
-       xml_delete_image(&wim->wim_info, wim->hdr.image_count);
-       wim->hdr.image_count--;
+       /* Unsuccessful; rollback by removing the new image.  */
+       delete_wim_image(wim, wim->hdr.image_count);
        return ret;
 }