Changeset 197b671 in mainline

Timestamp:

2011-03-10T19:11:23Z (13 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

d3ce9515

Parents:

7a34efde

Message:

Code cleaning

File:

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

uspace/app/mkminix/mkminix.c

@@ -69 +69 @@
 /*Generic MFS superblock*/
 struct mfs_sb_info {
-        devmap_handle_t handle;
         uint64_t n_inodes;
         uint64_t n_zones;
         aoff64_t dev_nblocks;
-        aoff64_t devblock_size;
         unsigned long ibmap_blocks;
         unsigned long zbmap_blocks;
@@ -91 +89 @@
 static int      num_of_set_bits(uint32_t n);
 static int      init_superblock(struct mfs_sb_info *sb);
-static int      write_superblock(struct mfs_sb_info *sbi);
-static int      write_superblock3(struct mfs_sb_info *sbi);
-static int      init_bitmaps(struct mfs_sb_info *sb);
-static int      init_inode_table(struct mfs_sb_info *sb);
-static int      make_root_ino(struct mfs_sb_info *sb);
-static int      make_root_ino3(struct mfs_sb_info *sb);
+static int      write_superblock(const struct mfs_sb_info *sbi);
+static int      write_superblock3(const struct mfs_sb_info *sbi);
+static int      init_bitmaps(const struct mfs_sb_info *sb);
+static int      init_inode_table(const struct mfs_sb_info *sb);
+static int      make_root_ino(const struct mfs_sb_info *sb);
+static int      make_root_ino3(const struct mfs_sb_info *sb);
 static void     mark_bmap(uint32_t *bmap, int idx, int v);
-static int      insert_dentries(struct mfs_sb_info *sb);
+static int      insert_dentries(const struct mfs_sb_info *sb);
+
+static devmap_handle_t handle;
 
 static struct option const long_options[] = {
@@ -115 +115 @@
         int rc, c, opt_ind;
         char *device_name;
+        aoff64_t devblock_size;
 
         struct mfs_sb_info sb;
@@ -200 +201 @@
         }
 
-        rc = devmap_device_get_handle(device_name, &sb.handle, 0);
+        rc = devmap_device_get_handle(device_name, &handle, 0);
         if (rc != EOK) {
                 printf(NAME ": Error resolving device `%s'.\n", device_name);
@@ -206 +207 @@
         }
 
-        rc = block_init(sb.handle, MFS_MIN_BLOCKSIZE);
+        rc = block_init(handle, MFS_MIN_BLOCKSIZE);
         if (rc != EOK)  {
                 printf(NAME ": Error initializing libblock.\n");
@@ -212 +213 @@
         }
 
-        rc = block_get_bsize(sb.handle, &sb.devblock_size);
+        rc = block_get_bsize(handle, &devblock_size);
         if (rc != EOK) {
                 printf(NAME ": Error determining device block size.\n");
@@ -218 +219 @@
         }
 
-        rc = block_get_nblocks(sb.handle, &sb.dev_nblocks);
+        rc = block_get_nblocks(handle, &sb.dev_nblocks);
         if (rc != EOK) {
                 printf(NAME ": Warning, failed to obtain block device size.\n");
@@ -226 +227 @@
         }
 
-        if (sb.devblock_size != 512) {
+        if (devblock_size != 512) {
                 printf(NAME ": Error. Device block size is not 512 bytes.\n");
                 return 2;
@@ -274 +275 @@
 }
 
-static int insert_dentries(struct mfs_sb_info *sb)
+static int insert_dentries(const struct mfs_sb_info *sb)
 {
         void *root_block;
@@ -309 +310 @@
         }
 
-        rc = block_write_direct(sb->handle, root_dblock, 1, root_block);
+        rc = block_write_direct(handle, root_dblock, 1, root_block);
 
         free(root_block);
@@ -315 +316 @@
 }
 
-static int init_inode_table(struct mfs_sb_info *sb)
+static int init_inode_table(const struct mfs_sb_info *sb)
 {
         unsigned int i;
@@ -338 +339 @@
 
         for (i = 0; i < itable_size; ++i, ++itable_off) {
-                rc = block_write_direct(sb->handle, itable_off, 1, itable_buf);
+                rc = block_write_direct(handle, itable_off, 1, itable_buf);
 
                 if (rc != EOK)
@@ -348 +349 @@
 }
 
-static int make_root_ino(struct mfs_sb_info *sb)
+static int make_root_ino(const struct mfs_sb_info *sb)
 {
         struct mfs_inode *ino_buf;
@@ -374 +375 @@
         ino_buf[MFS_ROOT_INO].i_dzone[0] = sb->first_data_zone;
 
-        rc = block_write_direct(sb->handle, itable_off, 1, ino_buf);
+        rc = block_write_direct(handle, itable_off, 1, ino_buf);
 
         free(ino_buf);
@@ -380 +381 @@
 }
 
-static int make_root_ino3(struct mfs_sb_info *sb)
+static int make_root_ino3(const struct mfs_sb_info *sb)
 {
         struct mfs2_inode *ino_buf;
@@ -412 +413 @@
         ino_buf[MFS_ROOT_INO].i_dzone[0] = sb->first_data_zone;
 
-        rc = block_write_direct(sb->handle, itable_off, 1, ino_buf);
+        rc = block_write_direct(handle, itable_off, 1, ino_buf);
 
         free(ino_buf);
@@ -496 +497 @@
 }
 
-static int write_superblock(struct mfs_sb_info *sbi)
+static int write_superblock(const struct mfs_sb_info *sbi)
 {
         struct mfs_superblock *sb;
@@ -517 +518 @@
         sb->s_state = MFS_VALID_FS;
 
-        rc = block_write_direct(sbi->handle, MFS_SUPERBLOCK, 1, sb);
+        rc = block_write_direct(handle, MFS_SUPERBLOCK, 1, sb);
         free(sb);
 
@@ -523 +524 @@
 }
 
-static int write_superblock3(struct mfs_sb_info *sbi)
+static int write_superblock3(const struct mfs_sb_info *sbi)
 {
         struct mfs3_superblock *sb;
@@ -544 +545 @@
         sb->s_disk_version = 3;
 
-        rc = block_write_direct(sbi->handle, MFS_SUPERBLOCK, 1, sb);
+        rc = block_write_direct(handle, MFS_SUPERBLOCK, 1, sb);
         free(sb);
 
@@ -550 +551 @@
 }
 
-static int init_bitmaps(struct mfs_sb_info *sb)
+static int init_bitmaps(const struct mfs_sb_info *sb)
 {
         uint32_t *ibmap_buf, *zbmap_buf;
@@ -584 +585 @@
 
         for (i = 0; i < ibmap_nblocks; ++i) {
-                if ((rc = block_write_direct(sb->handle, start_block + i,
+                if ((rc = block_write_direct(handle, start_block + i,
                                 1, (ibmap_buf8 + i * MFS_BLOCKSIZE))) != EOK)
                         return rc;
@@ -592 +593 @@
 
         for (i = 0; i < zbmap_nblocks; ++i) {
-                if ((rc = block_write_direct(sb->handle, start_block + i,
+                if ((rc = block_write_direct(handle, start_block + i,
                                 1, (zbmap_buf8 + i * MFS_BLOCKSIZE))) != EOK)
                         return rc;