Changeset 57640e7 in mainline

Timestamp:

2011-03-02T19:26:54Z (13 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

954bf385

Parents:

9a9a58e

Message:

Replace check_magin_number() with a more efficient version

Location:

uspace/srv/fs/minixfs

Files:

• mfs_super.c (modified) (1 diff)
• mfs_super.h (modified) (1 diff)

uspace/srv/fs/minixfs/mfs_super.c

@@ -95 +95 @@
 static bool check_magic_number(int16_t magic, bool *native, mfs_version_t *version)
 {
-        *native = true;
-
-repeat_check:
-
-        switch (*native ? magic : conv16(false, magic)) {
-        case MFS_MAGIC_V1:
+        if (magic == MFS_MAGIC_V1 || magic == MFS_MAGIC_V1R) {
+                *native = magic == MFS_MAGIC_V1;
                 *version = MFS_VERSION_V1;
                 return true;
-        case MFS_MAGIC_V2:
+        } else if (magic == MFS_MAGIC_V2 || magic == MFS_MAGIC_V2R) {
+                *native = magic == MFS_MAGIC_V2;
                 *version = MFS_VERSION_V2;
                 return true;
-        case MFS_MAGIC_V3:
+        } else if (magic == MFS_MAGIC_V3 || magic == MFS_MAGIC_V3R) {
+                *native = magic == MFS_MAGIC_V3;
                 *version = MFS_VERSION_V3;
                 return true;
-        default:
-                ;
         }
 
-        if (*native) {
-                *native = false;
-                goto repeat_check;
-        } else {
-                return false;
-        }
-
-        /*Should never happens*/
         return false;
 }

uspace/srv/fs/minixfs/mfs_super.h

@@ -38 +38 @@
 
 #define MFS_MAGIC_V1            0x137F
+#define MFS_MAGIC_V1R           0x7F13
+
 #define MFS_MAGIC_V2            0x2468
+#define MFS_MAGIC_V2R           0x6824
+
 #define MFS_MAGIC_V3            0x4D5A
+#define MFS_MAGIC_V3R           0x5A4D
 
 struct mfs_superblock {