Make some declarations formatted the same as the definitions

[wimlib] / include / wimlib / inode.h

diff --git a/include/wimlib/inode.h b/include/wimlib/inode.h
index f9b97cf858d0054f00ec5f7d4f395c297ce28a8b..07d1885fb7f15ae3feb884defddba3368186333b 100644 (file)
--- a/include/wimlib/inode.h
+++ b/include/wimlib/inode.h
@@ -106,25 +106,25 @@ struct wim_inode {
        u32 i_attributes;
 
        /* Root of a balanced binary search tree storing the child directory
-        * entries of this inode, if any.  Keyed by wim_dentry->file_name, case
+        * entries of this inode, if any.  Keyed by wim_dentry->d_name, case
         * sensitively.  If this inode is not a directory or if it has no
         * children then this will be an empty tree (NULL).  */
        struct avl_tree_node *i_children;
 
        /* Root of a balanced binary search tree storing the child directory
-        * entries of this inode, if any.  Keyed by wim_dentry->file_name, case
+        * entries of this inode, if any.  Keyed by wim_dentry->d_name, case
         * insensitively.  If this inode is not a directory or if it has no
         * children then this will be an empty tree (NULL).  */
        struct avl_tree_node *i_children_ci;
 
        /* List of dentries that are aliases for this inode.  There will be
         * i_nlink dentries in this list.  */
-       struct hlist_head i_dentry;
+       struct hlist_head i_alias_list;
 
        /* Field to place this inode into a list.  While reading a WIM image or
         * adding files to a WIM image this is owned by the inode table;
         * otherwise this links the inodes for the WIM image.  */
-       struct hlist_node i_hlist;
+       struct hlist_node i_hlist_node;
 
        /* Number of dentries that are aliases for this inode.  */
        u32 i_nlink : 30;
@@ -180,19 +180,19 @@ struct wim_inode {
                /* Device number, used only during image capture, so we can
                 * identify hard linked files by the combination of inode number
                 * and device number (rather than just inode number, which could
-                * be ambigious if the captured tree spans a mountpoint).  Set
+                * be ambiguous if the captured tree spans a mountpoint).  Set
                 * to 0 otherwise.  */
                u64 i_devno;
 
                /* Fields used only during extraction  */
                struct {
-                       /* List of aliases of this dentry that are being
-                        * extracted in the current extraction operation.  This
-                        * will be a (possibly nonproper) subset of the dentries
-                        * in the i_dentry list.  This list will be constructed
+                       /* A singly linked list of aliases of this inode that
+                        * are being extracted in the current extraction
+                        * operation.  This list may be shorter than the inode's
+                        * full alias list.  This list will be constructed
                         * regardless of whether the extraction backend supports
                         * hard links or not.  */
-                       struct list_head i_extraction_aliases;
+                       struct wim_dentry *i_first_extraction_alias;
 
                #ifdef WITH_NTFS_3G
                        /* In NTFS-3g extraction mode, this is set to the Master
@@ -206,7 +206,7 @@ struct wim_inode {
                 * WIMLIB_WRITE_FLAG_SEND_DONE_WITH_FILE_MESSAGES:  the number
                 * of streams this inode has that have not yet been fully read.
                 * */
-               u32 num_remaining_streams;
+               u32 i_num_remaining_streams;
 
 #ifdef WITH_FUSE
                struct {
@@ -268,11 +268,11 @@ new_inode(struct wim_dentry *dentry, bool set_timestamps);
 
 /* Iterate through each alias of the specified inode.  */
 #define inode_for_each_dentry(dentry, inode) \
-       hlist_for_each_entry((dentry), &(inode)->i_dentry, d_alias)
+       hlist_for_each_entry((dentry), &(inode)->i_alias_list, d_alias_node)
 
 /* Return an alias of the specified inode.  */
 #define inode_first_dentry(inode) \
-       hlist_entry(inode->i_dentry.first, struct wim_dentry, d_alias)
+       hlist_entry(inode->i_alias_list.first, struct wim_dentry, d_alias_node)
 
 /* Return the full path of an alias of the specified inode, or NULL if a full
  * path could not be determined.  */
@@ -359,8 +359,8 @@ inode_replace_stream_data(struct wim_inode *inode,
                          struct blob_table *blob_table);
 
 extern bool
-inode_add_stream_with_data(struct wim_inode *inode, int stream_type,
-                          const utf16lechar *stream_name,
+inode_add_stream_with_data(struct wim_inode *inode,
+                          int stream_type, const utf16lechar *stream_name,
                           const void *data, size_t size,
                           struct blob_table *blob_table);
 
@@ -397,8 +397,8 @@ extern bool
 inode_has_named_data_stream(const struct wim_inode *inode);
 
 extern int
-inode_resolve_streams(struct wim_inode *inode,
-                     struct blob_table *table, bool force);
+inode_resolve_streams(struct wim_inode *inode, struct blob_table *table,
+                     bool force);
 
 extern int
 blob_not_found_error(const struct wim_inode *inode, const u8 *hash);