Changeset e91b898 in mainline

Timestamp:

2011-07-28T19:13:00Z (13 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

99f043e

Parents:

5b38ecf0

Message:

cstyle

File:

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

uspace/app/mkminix/mkminix.c

@@ -101 +101 @@
 
 static struct option const long_options[] = {
-        { "help", no_argument, 0, 'h' },
-        { "long-names", no_argument, 0, 'l' },
-        { "block-size", required_argument, 0, 'b' },
-        { "inodes", required_argument, 0, 'i' },
-        { NULL, no_argument, 0, '1' },
-        { NULL, no_argument, 0, '2' },
-        { 0, 0, 0, 0 }
+                { "help", no_argument, 0, 'h' },
+                { "long-names", no_argument, 0, 'l' },
+                { "block-size", required_argument, 0, 'b' },
+                { "inodes", required_argument, 0, 'i' },
+                { NULL, no_argument, 0, '1' },
+                { NULL, no_argument, 0, '2' },
+                { 0, 0, 0, 0 }
 };
 
@@ -169 +169 @@
 
         if (sb.block_size < MFS_MIN_BLOCKSIZE || 
-                                sb.block_size > MFS_MAX_BLOCKSIZE) {
+                        sb.block_size > MFS_MAX_BLOCKSIZE) {
                 printf(NAME ":Error! Invalid block size.\n");
                 exit(0);
@@ -224 +224 @@
         } else {
                 printf(NAME ": Block device has %" PRIuOFF64 " blocks.\n",
-                    sb.dev_nblocks);
+                                sb.dev_nblocks);
         }
 
@@ -295 +295 @@
 
         dentry_ptr = root_block;
-        
+
         if (sb->fs_version != 3) {
                 /*Directory entries for V1/V2 filesystem*/
@@ -304 +304 @@
 
                 dentry = (struct mfs_dentry *) NEXT_DENTRY(dentry_ptr,
-                                                        sb->dirsize);
+                                sb->dirsize);
 
                 dentry->d_inum = MFS_ROOT_INO;
@@ -316 +316 @@
 
                 dentry = (struct mfs3_dentry *) NEXT_DENTRY(dentry_ptr,
-                                                        sb->dirsize);
+                                sb->dirsize);
 
                 dentry->d_inum = MFS_ROOT_INO;
@@ -387 +387 @@
         ino_buf[MFS_ROOT_INO - 1].i_gid = 0;
         ino_buf[MFS_ROOT_INO - 1].i_size = (sb->longnames ? MFSL_DIRSIZE :
-                                                MFS_DIRSIZE) * 2;
+        MFS_DIRSIZE) * 2;
         ino_buf[MFS_ROOT_INO - 1].i_mtime = sec;
         ino_buf[MFS_ROOT_INO - 1].i_nlinks = 2;
@@ -456 +456 @@
                 /*Valid only for MFS V1*/
                 sb->n_zones = sb->dev_nblocks > UINT16_MAX ? 
-                        UINT16_MAX : sb->dev_nblocks;
+                                UINT16_MAX : sb->dev_nblocks;
         } else {
                 /*Valid for MFS V2/V3*/
                 sb->n_zones = sb->dev_nblocks > UINT32_MAX ?
-                        UINT32_MAX : sb->dev_nblocks;
+                                UINT32_MAX : sb->dev_nblocks;
 
                 if (sb->fs_version == 3) {
@@ -476 +476 @@
         if (inodes % sb->ino_per_block)
                 inodes = ((inodes / sb->ino_per_block) + 1) * sb->ino_per_block;
-        
+
         if (sb->fs_version < 3)
                 sb->n_inodes = inodes > UINT16_MAX ? UINT16_MAX : inodes;
@@ -493 +493 @@
         /*Compute first data zone position*/
         sb->first_data_zone = 2 + sb->itable_size + 
-                                sb->zbmap_blocks + sb->ibmap_blocks;
+                        sb->zbmap_blocks + sb->ibmap_blocks;
 
         /*Set log2 of zone to block ratio to zero*/
@@ -690 +690 @@
                 printf(NAME": tool to create new Minix file systems\n");
         } else {
-        printf("Usage: [options] device\n"
-                "-1         Make a Minix version 1 filesystem\n"
-                "-2         Make a Minix version 2 filesystem\n"
-                "-b ##      Specify the block size in bytes (V3 only),\n"
-                "           valid block size values are 1024, 2048 and 4096 bytes per block\n"
-                "-i ##      Specify the number of inodes for the filesystem\n"
-                "-l         Use 30-char long filenames (V1/V2 only)\n");
+                printf("Usage: [options] device\n"
+                                "-1         Make a Minix version 1 filesystem\n"
+                                "-2         Make a Minix version 2 filesystem\n"
+                                "-b ##      Specify the block size in bytes (V3 only),\n"
+                                "           valid block size values are 1024, 2048 and 4096 bytes per block\n"
+                                "-i ##      Specify the number of inodes for the filesystem\n"
+                                "-l         Use 30-char long filenames (V1/V2 only)\n");
         }
 }