Changeset 84239b1 in mainline for uspace/lib/ext4/src/extent.c

Timestamp:

2018-03-11T19:39:11Z (6 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.

File:

• uspace/lib/ext4/src/extent.c (modified) (6 diffs)

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 */