Rename dentry name fields

[wimlib] / include / wimlib / dentry.h

diff --git a/include/wimlib/dentry.h b/include/wimlib/dentry.h
index 025a56cdd48ecbc04f9beb1fb1f3d050998e3b53..dc7770bcd241469d8dae207cd91b588865f10a8c 100644 (file)
--- a/include/wimlib/dentry.h
+++ b/include/wimlib/dentry.h
@@ -61,19 +61,19 @@ struct wim_dentry {
 
        /* Pointer to the UTF-16LE short filename (malloc()ed buffer), or NULL
         * if this dentry has no short name.  */
-       utf16lechar *short_name;
+       utf16lechar *d_short_name;
 
        /* Pointer to the UTF-16LE filename (malloc()ed buffer), or NULL if this
         * dentry has no filename.  */
-       utf16lechar *file_name;
+       utf16lechar *d_name;
 
        /* Length of UTF-16LE encoded short filename, in bytes, not including
         * the terminating zero wide-character. */
-       u16 short_name_nbytes;
+       u16 d_short_name_nbytes;
 
        /* Length of UTF-16LE encoded "long" file name, in bytes, not including
         * the terminating null character. */
-       u16 file_name_nbytes;
+       u16 d_name_nbytes;
 
        /* 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
@@ -105,7 +105,7 @@ struct wim_dentry {
 
        /* (Extraction only) Actual name to extract this dentry as.  This may be
         * either in 'tchars' or in 'utf16lechars', depending on what encoding
-        * the extraction backend needs.  This may alias 'file_name'.  If it
+        * the extraction backend needs.  This may alias 'd_name'.  If it
         * doesn't, it is an allocated buffer which must be freed.  */
        void *d_extraction_name;
 
@@ -277,12 +277,12 @@ dentry_has_children(const struct wim_dentry *dentry)
 static inline bool
 dentry_has_short_name(const struct wim_dentry *dentry)
 {
-       return dentry->short_name_nbytes != 0;
+       return dentry->d_short_name_nbytes != 0;
 }
 
 static inline bool
 dentry_has_long_name(const struct wim_dentry *dentry)
 {
-       return dentry->file_name_nbytes != 0;
+       return dentry->d_name_nbytes != 0;
 }
 #endif /* _WIMLIB_DENTRY_H */