Changeset 76299 in vbox for trunk/include

Timestamp:

Dec 19, 2018 7:10:01 PM (6 years ago)

Author:

vboxsync

Message:

Runtime/fs/extvfs: Updates

File:

• trunk/include/iprt/formats/ext.h (modified) (5 diffs)

trunk/include/iprt/formats/ext.h

@@ -551 +551 @@
  * @{ */
 /** Inode table and bitmaps are not initialized. */
-#define EXT_GROUP_DESC_F_INODE_UNINIT                RT_BIT_16(0)
+#define EXT_GROUP_DESC_F_INODE_UNINIT                RT_BIT(0)
 /** Block bitmap is not initialized. */
-#define EXT_GROUP_DESC_F_BLOCK_UNINIT                RT_BIT_16(1)
+#define EXT_GROUP_DESC_F_BLOCK_UNINIT                RT_BIT(1)
 /** Inode table is zeroed. */
-#define EXT_GROUP_DESC_F_INODE_ZEROED                RT_BIT_16(2)
+#define EXT_GROUP_DESC_F_INODE_ZEROED                RT_BIT(2)
 /** @} */
 
@@ -576 +576 @@
 typedef const EXTBLOCKGROUPDESC *PCEXTBLOCKGROUPDESC;
 
+
+/** Number of block entries in the inodes block map. */
+#define EXT_INODE_BLOCK_ENTRIES                      15
 
 /**
@@ -611 +614 @@
     } Osd1;
     /** 0x28: Block map or extent tree. */
-    uint32_t    au32Block[15];
+    uint32_t    au32Block[EXT_INODE_BLOCK_ENTRIES];
     /** 0x64: File version. */
     uint32_t    u32Version;
@@ -698 +701 @@
  * @{ */
 /** Others can execute the file. */
-#define EXT_INODE_MODE_EXEC_OTHER                    RT_BIT_16(0)
+#define EXT_INODE_MODE_EXEC_OTHER                    RT_BIT(0)
 /** Others can write to the file. */
-#define EXT_INODE_MODE_WRITE_OTHER                   RT_BIT_16(1)
+#define EXT_INODE_MODE_WRITE_OTHER                   RT_BIT(1)
 /** Others can read the file. */
-#define EXT_INODE_MODE_READ_OTHER                    RT_BIT_16(2)
+#define EXT_INODE_MODE_READ_OTHER                    RT_BIT(2)
 /** Members of the same group can execute the file. */
-#define EXT_INODE_MODE_EXEC_GROUP                    RT_BIT_16(3)
+#define EXT_INODE_MODE_EXEC_GROUP                    RT_BIT(3)
 /** Members of the same group can write to the file. */
-#define EXT_INODE_MODE_WRITE_GROUP                   RT_BIT_16(4)
+#define EXT_INODE_MODE_WRITE_GROUP                   RT_BIT(4)
 /** Members of the same group can read the file. */
-#define EXT_INODE_MODE_READ_GROUP                    RT_BIT_16(5)
+#define EXT_INODE_MODE_READ_GROUP                    RT_BIT(5)
 /** Owner can execute the file. */
-#define EXT_INODE_MODE_EXEC_OWNER                    RT_BIT_16(6)
+#define EXT_INODE_MODE_EXEC_OWNER                    RT_BIT(6)
 /** Owner can write to the file. */
-#define EXT_INODE_MODE_WRITE_OWNER                   RT_BIT_16(7)
+#define EXT_INODE_MODE_WRITE_OWNER                   RT_BIT(7)
 /** Owner can read the file. */
-#define EXT_INODE_MODE_READ_OWNER                    RT_BIT_16(8)
+#define EXT_INODE_MODE_READ_OWNER                    RT_BIT(8)
 /** Sticky file mode. */
-#define EXT_INODE_MODE_STICKY                        RT_BIT_16(9)
+#define EXT_INODE_MODE_STICKY                        RT_BIT(9)
 /** File is set GID. */
-#define EXT_INODE_MODE_SET_GROUP_ID                  RT_BIT_16(10)
+#define EXT_INODE_MODE_SET_GROUP_ID                  RT_BIT(10)
 /** File is set UID. */
-#define EXT_INODE_MODE_SET_USER_ID                   RT_BIT_16(11)
+#define EXT_INODE_MODE_SET_USER_ID                   RT_BIT(11)
 /** @} */
 
@@ -739 +742 @@
 /** Inode represents a socket. */
 #define EXT_INODE_MODE_TYPE_SOCKET                   UINT16_C(0xc000)
+/** Returns the inode type from the combined mode field. */
+#define EXT_INODE_MODE_TYPE_GET_TYPE(a_Mode)         ((a_Mode) & 0xf000)
 /** @} */