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

diff --git a/include/wimlib/metadata.h b/include/wimlib/metadata.h
index 178c4232..8a527ac3 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
@@ -46,66 +46,51 @@ 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)
+	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(lte, &(imd)->unhashed_streams, unhashed_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)
-
-extern void
-destroy_image_metadata(struct wim_image_metadata *imd,
-		       struct wim_lookup_table *table,
-		       bool free_metadata_lte);
+	list_for_each_entry_safe(lte, tmp, &(imd)->unhashed_streams, unhashed_list)
 
 extern void
 put_image_metadata(struct wim_image_metadata *imd,
 		   struct wim_lookup_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 */