WIMStruct: Rename 'deletion_occurred' to 'image_deletion_occurred'

diff --git a/include/wimlib/wim.h b/include/wimlib/wim.h
index 50db70d7005ddfa3c66f51ffbce0ff066578ed8b..412a9f7e5aef988e16f10b958418c7d28d785b9b 100644 (file)
--- a/include/wimlib/wim.h
+++ b/include/wimlib/wim.h
@@ -57,7 +57,7 @@ struct WIMStruct {
        int current_image;
 
        /* Have any images been deleted? */
        int current_image;
 
        /* Have any images been deleted? */

-       u8 deletion_occurred : 1;
+       u8 image_deletion_occurred : 1;

 
        /* Has the underlying WIM file been locked for appending?  */
        u8 locked_for_append : 1;
 
        /* Has the underlying WIM file been locked for appending?  */
        u8 locked_for_append : 1;

diff --git a/src/delete_image.c b/src/delete_image.c
index 7e33ea3cebbcf59dcc6435ca242f1513583b0541..533d62cb502675dfaf0a94ec8c8d3b3d6456ff1d 100644 (file)
--- a/src/delete_image.c
+++ b/src/delete_image.c
@@ -78,7 +78,7 @@ wimlib_delete_image(WIMStruct *wim, int image)
                /* Remove the image from the XML information. */
                xml_delete_image(&wim->wim_info, image);
 
                /* Remove the image from the XML information. */
                xml_delete_image(&wim->wim_info, image);
 

-               wim->deletion_occurred = 1;
+               wim->image_deletion_occurred = 1;

        }
        return 0;
 }
        }
        return 0;
 }

diff --git a/src/write.c b/src/write.c
index d8ce2dc326a4b747ff9ac1a083de9c6657dd0744..1de3e7a98c671a06c3acabeb9362f12a889b6c34 100644 (file)
--- a/src/write.c
+++ b/src/write.c
@@ -3248,7 +3248,7 @@ overwrite_wim_inplace(WIMStruct *wim, int write_flags, unsigned num_threads)
         * allow any file and metadata resources to appear without returning
         * WIMLIB_ERR_RESOURCE_ORDER (due to the fact that we would otherwise
         * overwrite these resources). */
         * allow any file and metadata resources to appear without returning
         * WIMLIB_ERR_RESOURCE_ORDER (due to the fact that we would otherwise
         * overwrite these resources). */

-       if (!wim->deletion_occurred && !any_images_modified(wim)) {
+       if (!wim->image_deletion_occurred && !any_images_modified(wim)) {

                /* If no images have been modified and no images have been
                 * deleted, a new lookup table does not need to be written.  We
                 * shall write the new XML data and optional integrity table
                /* If no images have been modified and no images have been
                 * deleted, a new lookup table does not need to be written.  We
                 * shall write the new XML data and optional integrity table


@@ -3405,8 +3405,9 @@ can_overwrite_wim_inplace(const WIMStruct *wim, int write_flags)
        if (write_flags & WIMLIB_WRITE_FLAG_REBUILD)
                return false;
 
        if (write_flags & WIMLIB_WRITE_FLAG_REBUILD)
                return false;
 

-       /* Deletions cause full rebuild by default.  */
-       if (wim->deletion_occurred && !(write_flags & WIMLIB_WRITE_FLAG_SOFT_DELETE))
+       /* Image deletions cause full rebuild by default.  */
+       if (wim->image_deletion_occurred &&
+           !(write_flags & WIMLIB_WRITE_FLAG_SOFT_DELETE))

                return false;
 
        /* Pipable WIMs cannot be updated in place, nor can a non-pipable WIM be
                return false;
 
        /* Pipable WIMs cannot be updated in place, nor can a non-pipable WIM be