Don't use entire word for d_extraction_name_nchars

[wimlib] / include / wimlib / dentry.h

diff --git a/include/wimlib/dentry.h b/include/wimlib/dentry.h
index 2e35c7584551ff687170dcd7867e6aff5f9f21a6..ad4e73ece91139e37443d10616df418d7ac530b2 100644 (file)
--- a/include/wimlib/dentry.h
+++ b/include/wimlib/dentry.h
@@ -73,33 +73,37 @@ struct wim_dentry {
        /* Length of 'd_short_name' in bytes, excluding the terminating null  */
        u16 d_short_name_nbytes;
 
+       /* (Extraction only) Length of 'd_extraction_name' in _characters_,
+        * excluding the terminating null  */
+       u16 d_extraction_name_nchars;
+
        /* When capturing from an NTFS volume using NTFS-3g, this flag is set on
         * dentries that were created from a filename in the WIN32 or WIN32+DOS
         * namespaces rather than the POSIX namespace.  Otherwise this will
         * always be 0.  */
-       u8 is_win32_name : 1;
+       u16 d_is_win32_name : 1;
 
        /* Temporary flag; always reset to 0 when done using.  */
-       u8 tmp_flag : 1;
+       u16 d_tmp_flag : 1;
 
        /* Used by wimlib_update_image()  */
-       u8 is_orphan : 1;
+       u16 d_is_orphan : 1;
 
        union {
-               /* 'subdir_offset' is only used while reading and writing this
+               /* The subdir offset is only used while reading and writing this
                 * dentry.  See the corresponding field in `struct
                 * wim_dentry_on_disk' for explanation.  */
-               u64 subdir_offset;
+               u64 d_subdir_offset;
 
                /* Temporary list field  */
-               struct list_head tmp_list;
+               struct list_head d_tmp_list;
        };
 
        /* Full path to this dentry in the WIM, in platform-dependent tchars
         * that can be printed without conversion.  By default this field will
         * be NULL and will only be calculated on-demand by the
         * calculate_dentry_full_path() or dentry_full_path() functions.  */
-       tchar *_full_path;
+       tchar *d_full_path;
 
        /* (Extraction only) Actual name to extract this dentry as.  This may be
         * either in 'tchars' or in 'utf16lechars', depending on what encoding
@@ -107,14 +111,11 @@ struct wim_dentry {
         * doesn't, it is an allocated buffer which must be freed.  */
        void *d_extraction_name;
 
-       /* (Extraction only) Number of characters in d_extraction_name.  */
-       size_t d_extraction_name_nchars;
-
        /* (Extraction only) Linked list node that connects all dentries being
         * extracted as part of the current extraction operation.  */
        struct list_head d_extraction_list_node;
 
-       /* (Extraction only) Pointer to the next alias for this dentry's inode
+       /* (Extraction only) Pointer to the next alias of this dentry's inode
         * that needs to be extracted as part of the current extraction
         * operation, or NULL if this is the last alias.  */
        struct wim_dentry *d_next_extraction_alias;