Changeset 3564cdd in mainline

Timestamp:

2011-03-05T17:51:18Z (14 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

dbc7aeb

Parents:

82650385

Message:

simplify directory entries structures definition

File:

• uspace/lib/c/include/fs/minix.h (modified) (2 diffs)

uspace/lib/c/include/fs/minix.h

@@ -50 +50 @@
 #define V1_NR_INDIRECT_ZONES    2
 
-#define V1_MAX_NAME_LEN         14
-#define V1L_MAX_NAME_LEN        30
-#define V2_MAX_NAME_LEN         14
-#define V2L_MAX_NAME_LEN        30
-#define V3_MAX_NAME_LEN         60
+#define MFS_MAX_NAME_LEN        14
+#define MFS_L_MAX_NAME_LEN      30
+#define MFS3_MAX_NAME_LEN       60
 
 #define MFS_MAGIC_V1            0x137F
@@ -158 +156 @@
 } __attribute__ ((packed));
 
-#define mfs_v2_dentry   mfs_v1_dentry
-#define mfs_v1l_dentry  mfs_v2l_dentry
-
-/*MinixFS V1 directory entry on-disk structure*/
-struct mfs_v1_dentry {
+/*MinixFS V1/V2 directory entry on-disk structure*/
+struct mfs_dentry {
         uint16_t d_inum;
-        char d_name[V1_MAX_NAME_LEN];
+        char d_name[MFS_MAX_NAME_LEN];
 } __attribute__ ((packed));
 
-/*MinixFS V2 with 30-char filenames (Linux variant)*/
+/*MinixFS V1/V2 with 30-char filenames (Linux variant)*/
 struct mfs_v2l_dentry {
         uint16_t d_inum;
-        char d_name[V2L_MAX_NAME_LEN];
+        char d_name[MFS_L_MAX_NAME_LEN];
 } __attribute__ ((packed));
 
 /*MinixFS V3 directory entry on-disk structure*/
-struct mfs_v3_dentry {
+struct mfs3_dentry {
         uint32_t d_inum;
-        char d_name[V3_MAX_NAME_LEN];
+        char d_name[MFS3_MAX_NAME_LEN];
 } __attribute__ ((packed));