inode/blob cleanups

[wimlib] / include / wimlib / wim.h

diff --git a/include/wimlib/wim.h b/include/wimlib/wim.h
index 5bc20a6b0e6823b39cefff0588400d7dff926c47..cb330a21fed44e9f316d2428567271e3ab4f2f0c 100644 (file)
--- a/include/wimlib/wim.h
+++ b/include/wimlib/wim.h
@@ -12,7 +12,7 @@
 
 struct wim_image_metadata;
 struct wim_info;
-struct wim_lookup_table;
+struct blob_table;
 
 /*
  * WIMStruct - represents a WIM, or a part of a non-standalone WIM
@@ -29,7 +29,7 @@ struct wim_lookup_table;
  *
  * Note 2: although this is the top-level data structure in wimlib, there do
  * exist cases in which a WIMStruct is not standalone:
- *     - streams have been referenced from another WIMStruct
+ *     - blobs have been referenced from another WIMStruct
  *     - an image has been imported into this WIMStruct from another
  *       (as this references the metadata rather than copies it)
  *
@@ -57,11 +57,11 @@ struct WIMStruct {
         * also maintained for a WIMStruct not backed by a file.  */
        struct wim_info *wim_info;
 
-       /* The lookup table for this WIMStruct.  If this WIMStruct has a backing
-        * file, then this table will index the streams contained in that file.
-        * In addition, this table may index streams that were added by updates
-        * or referenced from other WIMStructs.  */
-       struct wim_lookup_table *lookup_table;
+       /* The blob table for this WIMStruct.  If this WIMStruct has a backing
+        * file, then this table will index the blobs contained in that file.
+        * In addition, this table may index blobs that were added by updates or
+        * referenced from other WIMStructs.  */
+       struct blob_table *blob_table;
 
        /*
         * The 1-based index of the currently selected image in this WIMStruct,
@@ -154,7 +154,7 @@ struct WIMStruct {
 
 /*
  * Return true if and only if the WIM contains image metadata (actual directory
- * trees, not just a collection of streams and their checksums).
+ * trees, not just a collection of blobs and their checksums).
  *
  * See the description of the 'image_metadata' field.  Note that we return true
  * when the image count is 0 because it could be a WIM with 0 images.  It's only
@@ -182,6 +182,9 @@ static inline bool wim_is_pipable(const WIMStruct *wim)
        return (wim->hdr.magic == PWM_MAGIC);
 }
 
+extern bool
+wim_has_solid_resources(const WIMStruct *wim);
+
 extern int
 set_wim_hdr_cflags(int ctype, struct wim_header *hdr);
 
@@ -211,7 +214,7 @@ extern int
 for_image(WIMStruct *wim, int image, int (*visitor)(WIMStruct *));
 
 extern int
-wim_checksum_unhashed_streams(WIMStruct *wim);
+wim_checksum_unhashed_blobs(WIMStruct *wim);
 
 extern int
 delete_wim_image(WIMStruct *wim, int image);