Changeset 84239b1 in mainline for uspace/lib/ext4/src

Timestamp:

2018-03-11T19:39:11Z (7 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

f3d47c97

Parents:

850fd32

Message:

And there was much fixing.

Location:

uspace/lib/ext4/src

Files:

• balloc.c (modified) (2 diffs)
• extent.c (modified) (6 diffs)
• ops.c (modified) (4 diffs)

uspace/lib/ext4/src/balloc.c

@@ -352 +352 @@
         uint32_t free_blocks;
         uint32_t goal;
+        uint32_t block_size;
 
         /* Find GOAL */
@@ -585 +586 @@
 
 success:
-        /* Empty command - because of syntax */
-        ;
-
-        uint32_t block_size = ext4_superblock_get_block_size(sb);
+        block_size = ext4_superblock_get_block_size(sb);
 
         /* Update superblock free blocks count */

uspace/lib/ext4/src/extent.c

@@ -476 +476 @@
         uint16_t pos = 0;
         errno_t rc;
+        errno_t rc2;
         while (ext4_extent_header_get_depth(eh) != 0) {
                 /* Search index in index node by iblock */
@@ -513 +514 @@
 
 cleanup:
-        ;
-
-        errno_t rc2 = EOK;
+        rc2 = EOK;
 
         /*
@@ -623 +622 @@
         /* Find the first extent to modify */
         ext4_extent_path_t *path;
+        errno_t rc2;
         errno_t rc = ext4_extent_find_extent(inode_ref, iblock_from, &path);
         if (rc != EOK)
@@ -734 +734 @@
 
 cleanup:
-        ;
-
-        errno_t rc2 = EOK;
+        rc2 = EOK;
 
         /*
@@ -982 +980 @@
         /* Load the nearest leaf (with extent) */
         ext4_extent_path_t *path;
+        errno_t rc2;
         errno_t rc = ext4_extent_find_extent(inode_ref, new_block_idx, &path);
         if (rc != EOK)
@@ -1086 +1085 @@
 
 finish:
-        ;
-
-        errno_t rc2 = EOK;
+        rc2 = EOK;
 
         /* Set return values */

uspace/lib/ext4/src/ops.c

@@ -219 +219 @@
         ext4_node_t *eparent = EXT4_NODE(pfn);
         ext4_filesystem_t *fs = eparent->instance->filesystem;
+        errno_t rc2;
 
         if (!ext4_inode_is_type(fs->superblock, eparent->inode_ref->inode,
@@ -244 +245 @@
 
 exit:
-        ;
-
         /* Destroy search result structure */
-        errno_t const rc2 = ext4_directory_destroy_result(&result);
+        rc2 = ext4_directory_destroy_result(&result);
         return rc == EOK ? rc2 : rc;
 }
@@ -1279 +1278 @@
 {
         fs_node_t *fn;
+        errno_t rc2;
         errno_t rc = ext4_node_get(&fn, service_id, index);
         if (rc != EOK)
@@ -1395 +1395 @@
 
 exit:
-        ;
-
-        errno_t const rc2 = ext4_node_put(fn);
+        rc2 = ext4_node_put(fn);
         return rc == EOK ? rc2 : rc;
 }