new internal image deletion helper

[wimlib] / include / wimlib / wim.h

diff --git a/include/wimlib/wim.h b/include/wimlib/wim.h
index 4afa60eb8594943ecc8ad06e4d8912384e51627b..a6275fa0669764d71dbc2a3b13939b7af571eb73 100644 (file)
--- a/include/wimlib/wim.h
+++ b/include/wimlib/wim.h
@@ -1,6 +1,7 @@
 #ifndef _WIMLIB_WIM_H
 #define _WIMLIB_WIM_H
 
+#include "wimlib.h"
 #include "wimlib/header.h"
 #include "wimlib/types.h"
 #include "wimlib/file_io.h"
@@ -42,8 +43,9 @@ struct WIMStruct {
        /* Temporary field */
        void *private;
 
-       /* LZX compression context for default thread  */
-       struct wimlib_lzx_context *lzx_context;
+       struct wimlib_decompressor *decompressor;
+       u8 decompressor_ctype;
+       u32 decompressor_max_block_size;
 
        struct list_head subwims;
 
@@ -55,27 +57,22 @@ struct WIMStruct {
        int current_image;
 
        /* Have any images been deleted? */
-       u8 deletion_occurred : 1;
+       u8 image_deletion_occurred : 1;
 
-       /* Do we know that all the stream reference counts in the WIM are
-        * correct?  If so, this is set to 1 and deletions are safe; otherwise
-        * this is set to 0 and deletions are not safe until reference counts
-        * are recalculated.  (This is due to a bug in M$'s software that
-        * generates WIMs with invalid reference counts.)  */
-       u8 refcnts_ok : 1;
-
-       u8 wim_locked : 1;
-
-       u8 guid_set_explicitly : 1;
+       /* Has the underlying WIM file been locked for appending?  */
+       u8 locked_for_append : 1;
 
        /* One of WIMLIB_COMPRESSION_TYPE_*, cached from the header flags. */
-       u8 compression_type : 2;
+       u8 compression_type;
 
-       /* Overwritten compression type for wimlib_overwrite() or
-        * wimlib_write().  Can be changed by
-        * wimlib_set_output_compression_type(); otherwise is the same as
-        * compression_type.  */
-       u8 out_compression_type : 2;
+       /* Overridden compression type for wimlib_overwrite() or wimlib_write().
+        * Can be changed by wimlib_set_output_compression_type(); otherwise is
+        * the same as compression_type.  */
+       u8 out_compression_type;
+
+       /* Compression type for writing packed streams; can be set with
+        * wimlib_set_output_pack_compression_type().  */
+       u8 out_pack_compression_type;
 
        /* Uncompressed size of compressed chunks in this WIM (cached from
         * header).  */
@@ -85,6 +82,15 @@ struct WIMStruct {
         * be changed by wimlib_set_output_chunk_size(); otherwise is the same
         * as chunk_size.  */
        u32 out_chunk_size;
+
+       /* Chunk size for writing packed streams; can be set with
+        * wimlib_set_output_pack_chunk_size().  */
+       u32 out_pack_chunk_size;
+
+       /* Currently registered progress function for this WIMStruct, or NULL if
+        * no progress function is currently registered for this WIMStruct.  */
+       wimlib_progress_func_t progfunc;
+       void *progctx;
 };
 
 static inline bool wim_is_pipable(const WIMStruct *wim)
@@ -94,7 +100,7 @@ static inline bool wim_is_pipable(const WIMStruct *wim)
 
 static inline bool wim_has_integrity_table(const WIMStruct *wim)
 {
-       return (wim->hdr.integrity.offset != 0);
+       return (wim->hdr.integrity_table_reshdr.offset_in_wim != 0);
 }
 
 static inline bool wim_has_metadata(const WIMStruct *wim)
@@ -102,9 +108,6 @@ static inline bool wim_has_metadata(const WIMStruct *wim)
        return (wim->image_metadata != NULL || wim->hdr.image_count == 0);
 }
 
-extern int
-wim_recalculate_refcnts(WIMStruct *wim);
-
 extern int
 set_wim_hdr_cflags(int ctype, struct wim_header *hdr);
 
@@ -112,8 +115,7 @@ extern int
 init_wim_header(struct wim_header *hdr, int ctype, u32 chunk_size);
 
 extern int
-read_wim_header(const tchar *filename, struct filedes *in_fd,
-               struct wim_header *hdr);
+read_wim_header(WIMStruct *wim, struct wim_header *hdr);
 
 extern int
 write_wim_header(const struct wim_header *hdr, struct filedes *out_fd);
@@ -125,9 +127,6 @@ write_wim_header_at_offset(const struct wim_header *hdr, struct filedes *out_fd,
 extern int
 write_wim_header_flags(u32 hdr_flags, struct filedes *out_fd);
 
-extern int
-rename_wim_path(WIMStruct *wim, const tchar *from, const tchar *to);
-
 extern int
 select_wim_image(WIMStruct *wim, int image);
 
@@ -138,25 +137,18 @@ extern int
 wim_checksum_unhashed_streams(WIMStruct *wim);
 
 extern int
-reopen_wim(WIMStruct *wim);
+delete_wim_image(WIMStruct *wim, int image);
 
 /* Internal open flags (pass to open_wim_as_WIMStruct(), not wimlib_open_wim())
  */
 #define WIMLIB_OPEN_FLAG_FROM_PIPE     0x80000000
-#define WIMLIB_OPEN_MASK_PUBLIC                0x7fffffff
 
 extern int
 open_wim_as_WIMStruct(const void *wim_filename_or_fd, int open_flags,
                      WIMStruct **wim_ret,
-                     wimlib_progress_func_t progress_func);
-
-extern int
-close_wim(WIMStruct *wim);
+                     wimlib_progress_func_t progfunc, void *progctx);
 
 extern int
 can_modify_wim(WIMStruct *wim);
 
-extern int
-can_delete_from_wim(WIMStruct *wim);
-
 #endif /* _WIMLIB_WIM_H */