Changeset 939b7d2 in mainline

Timestamp:

2011-03-05T11:44:59Z (14 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

82650385

Parents:

19a057f9

Message:

Remove redundant code

File:

• uspace/app/mkminix/mkminix.c (modified) (6 diffs)

uspace/app/mkminix/mkminix.c

@@ -60 +60 @@
 
 typedef struct mfs_params {
-        mfs_version_t fs_version;
+        uint16_t fs_magic;
         uint32_t block_size;
         size_t devblock_size;
@@ -96 +96 @@
 
         /*Default is MinixFS V3*/
-        opt.fs_version = MFS_VERSION_V3;
+        opt.fs_magic = MFS_MAGIC_V3;
 
         /*Default block size is 4Kb*/
@@ -116 +116 @@
                         exit(0);
                 case '1':
-                        opt.fs_version = MFS_VERSION_V1;
+                        opt.fs_magic = MFS_MAGIC_V1;
                         opt.block_size = MFS_MIN_BLOCK_SIZE;
                         break;
                 case '2':
-                        opt.fs_version = MFS_VERSION_V2;
+                        opt.fs_magic = MFS_MAGIC_V2;
                         opt.block_size = MFS_MIN_BLOCK_SIZE;
                         break;
                 case '3':
-                        opt.fs_version = MFS_VERSION_V3;
+                        opt.fs_magic = MFS_MAGIC_V3;
                         break;
                 case 'b':
@@ -147 +147 @@
                 exit(0);
         } else if (opt.block_size > MFS_MIN_BLOCK_SIZE && 
-                        opt.fs_version != MFS_VERSION_V3) {
+                        opt.fs_magic != MFS_MAGIC_V3) {
                 printf(NAME ":Error! Block size > 1024 is supported by V3 filesystem only.\n");
                 exit(0);
-        } else if (opt.fs_version == MFS_VERSION_V3 && opt.fs_longnames) {
+        } else if (opt.fs_magic == MFS_MAGIC_V3 && opt.fs_longnames) {
                 printf(NAME ":Error! Long filenames are supported by V1/V2 filesystem only.\n");
                 exit(0);
@@ -199 +199 @@
         /*Prepare superblock*/
 
-        if (opt.fs_version == MFS_VERSION_V3) {
+        if (opt.fs_magic == MFS_MAGIC_V3) {
                 sb3 = (struct mfs3_superblock *) malloc(sizeof(struct mfs3_superblock));
                 if (!sb3) {
@@ -220 +220 @@
 static void prepare_superblock(struct mfs_superblock *sb, mfs_params_t *opt)
 {
-        switch (opt->fs_version) {
-        case MFS_VERSION_V1L:
-                sb->s_magic = MFS_MAGIC_V1L;
-                break;
-        case MFS_VERSION_V1:
-                sb->s_magic = MFS_MAGIC_V1;
-                break;
-        case MFS_VERSION_V2:
-                sb->s_magic = MFS_MAGIC_V2;
-                break;
-        case MFS_VERSION_V2L:
-                sb->s_magic = MFS_MAGIC_V2L;
-                break;
-        default:
-                break;
-        }
+        if (opt->fs_longnames) {
+                if (opt->fs_magic == MFS_MAGIC_V1)
+                        opt->fs_magic = MFS_MAGIC_V1L;
+                else
+                        opt->fs_magic = MFS_MAGIC_V2L;
+        }
+
+        sb->s_magic = opt->fs_magic;
 
         /*Valid only for MFS V1*/