X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=include%2Fwimlib%2Fmetadata.h;h=af35b539c173c28d2962bc6e1a1507394690678d;hp=178c4232ae6b7c1daa302ce6d5cfc5900b35adc9;hb=aa3a2830cd4154238bc6a342ffea43d9ac69a14c;hpb=e8c3ca2d1d0cac3d64985b45a9f654d2029a7518

diff --git a/include/wimlib/metadata.h b/include/wimlib/metadata.h
index 178c4232..af35b539 100644
--- a/include/wimlib/metadata.h
+++ b/include/wimlib/metadata.h
@@ -9,7 +9,7 @@
 struct _ntfs_volume;
 #endif
 
-/* Metadata for a WIM image */
+/* Metadata for a WIM image  */
 struct wim_image_metadata {
 
 	/* Number of WIMStruct's that are sharing this image metadata (from
@@ -22,23 +22,22 @@ struct wim_image_metadata {
 	/* Pointer to the security data of the image. */
 	struct wim_security_data *security_data;
 
-	/* Pointer to the lookup table entry for this image's metadata resource
-	 */
-	struct wim_lookup_table_entry *metadata_lte;
+	/* Pointer to the blob descriptor for this image's metadata resource */
+	struct blob_descriptor *metadata_blob;
 
 	/* Linked list of 'struct wim_inode's for this image. */
 	struct list_head inode_list;
 
-	/* Linked list of 'struct wim_lookup_table_entry's for this image that
-	 * are referred to in the dentry tree, but have not had a SHA1 message
-	 * digest calculated yet and therefore have not been inserted into the
-	 * WIM's lookup table.  This list is added to during wimlib_add_image()
-	 * and wimlib_mount_image() (read-write only). */
-	struct list_head unhashed_streams;
+	/* Linked list of 'struct blob_descriptor's for blobs that are
+	 * referenced by this image's dentry tree, but have not had their SHA-1
+	 * message digests calculated yet and therefore have not been inserted
+	 * into the WIMStruct's blob table.  This list is appended to when files
+	 * are scanned for inclusion in this WIM image.  */
+	struct list_head unhashed_blobs;
 
-	/* 1 iff the dentry tree has been modified.  If this is the case, the
-	 * memory for the dentry tree should not be freed when switching to a
-	 * different WIM image. */
+	/* 1 iff the dentry tree has been modified from the original stored in
+	 * the WIM file.  If this is the case, the memory for the dentry tree
+	 * should not be freed when switching to a different WIM image. */
 	u8 modified : 1;
 
 #ifdef WITH_NTFS_3G
@@ -46,66 +45,50 @@ struct wim_image_metadata {
 #endif
 };
 
+/* Retrieve the metadata of the image in @wim currently selected with
+ * select_wim_image().  */
 static inline struct wim_image_metadata *
-wim_get_current_image_metadata(WIMStruct *w)
+wim_get_current_image_metadata(WIMStruct *wim)
 {
-	return w->image_metadata[w->current_image - 1];
-}
-
-static inline const struct wim_image_metadata *
-wim_get_const_current_image_metadata(const WIMStruct *w)
-{
-	return w->image_metadata[w->current_image - 1];
+	return wim->image_metadata[wim->current_image - 1];
 }
 
+/* Retrieve the root dentry of the image in @wim currently selected with
+ * select_wim_image().  */
 static inline struct wim_dentry *
-wim_root_dentry(WIMStruct *w)
+wim_get_current_root_dentry(WIMStruct *wim)
 {
-	return wim_get_current_image_metadata(w)->root_dentry;
+	return wim_get_current_image_metadata(wim)->root_dentry;
 }
 
+/* Retrieve the security data of the image in @wim currently selected with
+ * select_wim_image().  */
 static inline struct wim_security_data *
-wim_security_data(WIMStruct *w)
-{
-	return wim_get_current_image_metadata(w)->security_data;
-}
-
-static inline const struct wim_security_data *
-wim_const_security_data(const WIMStruct *w)
+wim_get_current_security_data(WIMStruct *wim)
 {
-	return wim_get_const_current_image_metadata(w)->security_data;
+	return wim_get_current_image_metadata(wim)->security_data;
 }
 
-/* Iterate over each inode in a WIM image that has not yet been hashed */
+/* Iterate over each inode in a WIM image  */
 #define image_for_each_inode(inode, imd) \
-	list_for_each_entry(inode, &imd->inode_list, i_list)
-
-/* Iterate over each stream in a WIM image that has not yet been hashed */
-#define image_for_each_unhashed_stream(lte, imd) \
-	list_for_each_entry(lte, &imd->unhashed_streams, unhashed_list)
+	list_for_each_entry(inode, &(imd)->inode_list, i_list)
 
-/* Iterate over each stream in a WIM image that has not yet been hashed (safe
- * against stream removal) */
-#define image_for_each_unhashed_stream_safe(lte, tmp, imd) \
-	list_for_each_entry_safe(lte, tmp, &imd->unhashed_streams, unhashed_list)
+/* Iterate over each blob in a WIM image that has not yet been hashed */
+#define image_for_each_unhashed_blob(blob, imd) \
+	list_for_each_entry(blob, &(imd)->unhashed_blobs, unhashed_list)
 
-extern void
-destroy_image_metadata(struct wim_image_metadata *imd,
-		       struct wim_lookup_table *table,
-		       bool free_metadata_lte);
+/* Iterate over each blob in a WIM image that has not yet been hashed (safe
+ * against blob removal) */
+#define image_for_each_unhashed_blob_safe(blob, tmp, imd) \
+	list_for_each_entry_safe(blob, tmp, &(imd)->unhashed_blobs, unhashed_list)
 
 extern void
-put_image_metadata(struct wim_image_metadata *imd,
-		   struct wim_lookup_table *table);
+put_image_metadata(struct wim_image_metadata *imd, struct blob_table *table);
 
 extern int
-append_image_metadata(WIMStruct *w, struct wim_image_metadata *imd);
+append_image_metadata(WIMStruct *wim, struct wim_image_metadata *imd);
 
 extern struct wim_image_metadata *
-new_image_metadata(void);
-
-extern struct wim_image_metadata **
-new_image_metadata_array(unsigned num_images);
-
+new_image_metadata(void) _malloc_attribute;
 
 #endif /* _WIMLIB_METADATA_H */