Remove WIMLIB_WRITE_FLAG_NO_PACK_STREAMS

[wimlib] / src / write.c

diff --git a/src/write.c b/src/write.c
index 3895088ee2c408e5d990a073512100f3bb0bc309..3702585bf3e9b6992a009470aa44d1dbbcadc09c 100644 (file)
--- a/src/write.c
+++ b/src/write.c
@@ -2542,9 +2542,6 @@ write_wim_part(WIMStruct *wim,
        if (write_flags & WIMLIB_WRITE_FLAG_PACK_STREAMS)
                DEBUG("\tPACK_STREAMS");
 
-       if (write_flags & WIMLIB_WRITE_FLAG_NO_PACK_STREAMS)
-               DEBUG("\tNO_PACK_STREAMS");
-
        if (write_flags & WIMLIB_WRITE_FLAG_FILE_DESCRIPTOR)
                DEBUG("\tFILE_DESCRIPTOR");
 
@@ -2593,12 +2590,6 @@ write_wim_part(WIMStruct *wim,
                                    WIMLIB_WRITE_FLAG_NOT_PIPABLE))
                return WIMLIB_ERR_INVALID_PARAM;
 
-       if ((write_flags & (WIMLIB_WRITE_FLAG_PACK_STREAMS |
-                           WIMLIB_WRITE_FLAG_NO_PACK_STREAMS))
-                               == (WIMLIB_WRITE_FLAG_PACK_STREAMS |
-                                   WIMLIB_WRITE_FLAG_NO_PACK_STREAMS))
-               return WIMLIB_ERR_INVALID_PARAM;
-
        /* Save previous header, then start initializing the new one.  */
        memcpy(&hdr_save, &wim->hdr, sizeof(struct wim_header));
 
@@ -2617,13 +2608,6 @@ write_wim_part(WIMStruct *wim,
                        write_flags |= WIMLIB_WRITE_FLAG_CHECK_INTEGRITY;
                }
 
-       if (!(write_flags & (WIMLIB_WRITE_FLAG_PACK_STREAMS |
-                            WIMLIB_WRITE_FLAG_NO_PACK_STREAMS)))
-               if (wim->hdr.wim_version == WIM_VERSION_PACKED_STREAMS) {
-                       DEBUG("WIM version 3584; default to PACK_STREAMS.");
-                       write_flags |= WIMLIB_WRITE_FLAG_PACK_STREAMS;
-               }
-
        if ((write_flags & (WIMLIB_WRITE_FLAG_PIPABLE |
                            WIMLIB_WRITE_FLAG_PACK_STREAMS))
                                    == (WIMLIB_WRITE_FLAG_PIPABLE |
@@ -2931,20 +2915,9 @@ overwrite_wim_inplace(WIMStruct *wim, int write_flags,
                if (wim_has_integrity_table(wim))
                        write_flags |= WIMLIB_WRITE_FLAG_CHECK_INTEGRITY;
 
-       /* Set default packed flag.  */
-       if (!(write_flags & (WIMLIB_WRITE_FLAG_PACK_STREAMS |
-                            WIMLIB_WRITE_FLAG_NO_PACK_STREAMS)))
-       {
-       #if 0
-               if (wim->hdr.wim_version == WIM_VERSION_PACKED_STREAMS)
-                       write_flags |= WIMLIB_WRITE_FLAG_PACK_STREAMS;
-       #endif
-               /* wimlib allows multiple packs in a single WIM, but they don't
-                * seem to be compatible with WIMGAPI.  Write new streams
-                * unpacked.  */
-       } else if (write_flags & WIMLIB_WRITE_FLAG_PACK_STREAMS) {
+       /* Set WIM version if adding packed streams.  */
+       if (write_flags & WIMLIB_WRITE_FLAG_PACK_STREAMS)
                wim->hdr.wim_version = WIM_VERSION_PACKED_STREAMS;
-       }
 
        /* Set additional flags for overwrite.  */
        write_flags |= WIMLIB_WRITE_FLAG_OVERWRITE |