X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=src%2Fdelete_image.c;h=862fb66e53e2efb1f0623aef17ce894d8c746f0f;hp=389d230917dd5d3e1c9c982e0ff902be7e17ecc8;hb=e8c3ca2d1d0cac3d64985b45a9f654d2029a7518;hpb=14baa6ae892debbaa18dba8119931580efd0e517

diff --git a/src/delete_image.c b/src/delete_image.c
index 389d2309..862fb66e 100644
--- a/src/delete_image.c
+++ b/src/delete_image.c
@@ -21,9 +21,16 @@
  * along with wimlib; if not, see http://www.gnu.org/licenses/.
  */
 
-#include "wimlib_internal.h"
-#include "xml.h"
-#include <string.h>
+#ifdef HAVE_CONFIG_H
+#  include "config.h"
+#endif
+
+#include "wimlib.h"
+#include "wimlib/error.h"
+#include "wimlib/metadata.h"
+#include "wimlib/util.h"
+#include "wimlib/wim.h"
+#include "wimlib/xml.h"
 
 /*
  * Deletes an image from the WIM.
@@ -31,63 +38,62 @@
 WIMLIBAPI int
 wimlib_delete_image(WIMStruct *w, int image)
 {
-	int i;
 	int ret;
+	int first, last;
 
 	if (w->hdr.total_parts != 1) {
 		ERROR("Deleting an image from a split WIM is not supported.");
 		return WIMLIB_ERR_SPLIT_UNSUPPORTED;
 	}
 
-	if (image == WIMLIB_ALL_IMAGES) {
-		for (i = w->hdr.image_count; i >= 1; i--) {
-			ret = wimlib_delete_image(w, i);
-			if (ret != 0)
-				return ret;
-		}
-		return 0;
-	}
-
 	if (!w->all_images_verified) {
 		ret = wim_run_full_verifications(w);
-		if (ret != 0)
+		if (ret)
 			return ret;
 	}
 
-	DEBUG("Deleting image %d", image);
+	if (image == WIMLIB_ALL_IMAGES) {
+		last = w->hdr.image_count;
+		first = 1;
+	} else {
+		last = image;
+		first = image;
+	}
+
+	for (image = last; image >= first; image--) {
+		DEBUG("Deleting image %d", image);
 
-	/* Even if the dentry tree is not allocated, we must select it (and
-	 * therefore allocate it) so that we can decrement the reference counts
-	 * in the lookup table.  */
-	ret = select_wim_image(w, image);
-	if (ret != 0)
-		return ret;
+		/* Even if the dentry tree is not allocated, we must select it (and
+		 * therefore allocate it) so that we can decrement the reference counts
+		 * in the lookup table.  */
+		ret = select_wim_image(w, image);
+		if (ret)
+			return ret;
 
-	/* Free the dentry tree, any lookup table entries that have their refcnt
-	 * decremented to 0, and the security data. */
-	destroy_image_metadata(&w->image_metadata[image - 1], w->lookup_table);
+		/* Unless the image metadata is shared by another WIMStruct, free the
+		 * dentry tree, any lookup table entries that have their refcnt
+		 * decremented to 0, and the security data. */
+		put_image_metadata(w->image_metadata[image - 1], w->lookup_table);
 
-	/* Get rid of the empty slot in the image metadata array. */
-	memmove(&w->image_metadata[image - 1], &w->image_metadata[image],
-		(w->hdr.image_count - image) * sizeof(struct wim_image_metadata));
+		/* Get rid of the empty slot in the image metadata array. */
+		for (int i = image - 1; i < w->hdr.image_count - 1; i++)
+			w->image_metadata[i] = w->image_metadata[i + 1];
 
-	/* Decrement the image count. */
-	if (--w->hdr.image_count == 0) {
-		FREE(w->image_metadata);
-		w->image_metadata = NULL;
-	}
+		/* Decrement the image count. */
+		--w->hdr.image_count;
 
-	/* Fix the boot index. */
-	if (w->hdr.boot_idx == image)
-		w->hdr.boot_idx = 0;
-	else if (w->hdr.boot_idx > image)
-		w->hdr.boot_idx--;
+		/* Fix the boot index. */
+		if (w->hdr.boot_idx == image)
+			w->hdr.boot_idx = 0;
+		else if (w->hdr.boot_idx > image)
+			w->hdr.boot_idx--;
 
-	w->current_image = WIMLIB_NO_IMAGE;
+		w->current_image = WIMLIB_NO_IMAGE;
 
-	/* Remove the image from the XML information. */
-	xml_delete_image(&w->wim_info, image);
+		/* Remove the image from the XML information. */
+		xml_delete_image(&w->wim_info, image);
 
-	w->deletion_occurred = 1;
+		w->deletion_occurred = 1;
+	}
 	return 0;
 }