wim_root_dentry() => wim_get_current_root_dentry()

[wimlib] / include / wimlib / metadata.h

diff --git a/include/wimlib/metadata.h b/include/wimlib/metadata.h
index 7f1c7c0248b74bcac1ca782376540a274be9b32a..6e4212044d5f730a52e868702ebf17538325dc43 100644 (file)
--- a/include/wimlib/metadata.h
+++ b/include/wimlib/metadata.h
@@ -46,36 +46,30 @@ 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 *wim)
 {
        return wim->image_metadata[wim->current_image - 1];
 }
 
-static inline const struct wim_image_metadata *
-wim_get_const_current_image_metadata(const WIMStruct *wim)
-{
-       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 *wim)
+wim_get_current_root_dentry(WIMStruct *wim)
 {
        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 *wim)
+wim_get_current_security_data(WIMStruct *wim)
 {
        return wim_get_current_image_metadata(wim)->security_data;
 }
 
-static inline const struct wim_security_data *
-wim_const_security_data(const WIMStruct *wim)
-{
-       return wim_get_const_current_image_metadata(wim)->security_data;
-}
-
 /* Iterate over each inode in a WIM image that has not yet been hashed */
 #define image_for_each_inode(inode, imd) \
        list_for_each_entry(inode, &imd->inode_list, i_list)