X-Git-Url: https://wimlib.net/git/?a=blobdiff_plain;f=include%2Fwimlib%2Fdentry.h;h=cbc0b7c3052300dccaca1baf911c700893d56cf5;hb=ee547cc83f231d727e4d9984c23e86d96d3da769;hp=dc7770bcd241469d8dae207cd91b588865f10a8c;hpb=8df639463ae0c754d2b1af3d6c1d22e59ee3ccf8;p=wimlib

diff --git a/include/wimlib/dentry.h b/include/wimlib/dentry.h
index dc7770bc..cbc0b7c3 100644
--- a/include/wimlib/dentry.h
+++ b/include/wimlib/dentry.h
@@ -59,49 +59,47 @@ struct wim_dentry {
 	 * its inode (d_inode) */
 	struct hlist_node d_alias_node;
 
-	/* Pointer to the UTF-16LE short filename (malloc()ed buffer), or NULL
-	 * if this dentry has no short name.  */
-	utf16lechar *d_short_name;
-
 	/* Pointer to the UTF-16LE filename (malloc()ed buffer), or NULL if this
 	 * dentry has no filename.  */
 	utf16lechar *d_name;
 
-	/* Length of UTF-16LE encoded short filename, in bytes, not including
-	 * the terminating zero wide-character. */
-	u16 d_short_name_nbytes;
+	/* Pointer to the UTF-16LE short filename (malloc()ed buffer), or NULL
+	 * if this dentry has no short name.  */
+	utf16lechar *d_short_name;
 
-	/* Length of UTF-16LE encoded "long" file name, in bytes, not including
-	 * the terminating null character. */
+	/* Length of 'd_name' in bytes, excluding the terminating null  */
 	u16 d_name_nbytes;
 
+	/* Length of 'd_short_name' in bytes, excluding the terminating null  */
+	u16 d_short_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
 	 * namespaces rather than the POSIX namespace.  Otherwise this will
 	 * always be 0.  */
-	u8 is_win32_name : 1;
+	u8 d_is_win32_name : 1;
 
 	/* Temporary flag; always reset to 0 when done using.  */
-	u8 tmp_flag : 1;
+	u8 d_tmp_flag : 1;
 
 	/* Used by wimlib_update_image()  */
-	u8 is_orphan : 1;
+	u8 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
@@ -275,14 +273,14 @@ dentry_has_children(const struct wim_dentry *dentry)
 }
 
 static inline bool
-dentry_has_short_name(const struct wim_dentry *dentry)
+dentry_has_long_name(const struct wim_dentry *dentry)
 {
-	return dentry->d_short_name_nbytes != 0;
+	return dentry->d_name_nbytes != 0;
 }
 
 static inline bool
-dentry_has_long_name(const struct wim_dentry *dentry)
+dentry_has_short_name(const struct wim_dentry *dentry)
 {
-	return dentry->d_name_nbytes != 0;
+	return dentry->d_short_name_nbytes != 0;
 }
 #endif /* _WIMLIB_DENTRY_H */