Changeset 03936831 in mainline for uspace/app/mkmfs/mkmfs.c

Timestamp:

2017-10-20T09:16:55Z (8 years ago)

Author:

Ondřej Hlavatý <aearsis@…>

Branches:

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

Children:

1252e81

Parents:

fe1c48d (diff), 04efacc (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline to fix build

File:

• uspace/app/mkmfs/mkmfs.c (modified) (4 diffs)

uspace/app/mkmfs/mkmfs.c

@@ -348 +348 @@
         unsigned int i;
         uint8_t *itable_buf;
-        int rc;
+        int rc = EOK;
 
         long itable_off = sb->zbmap_blocks + sb->ibmap_blocks + 2;
@@ -633 +633 @@
         const unsigned int zbmap_nblocks = sb->zbmap_blocks;
         unsigned int i;
-        int rc;
+        int rc = EOK;
 
         ibmap_buf = malloc(ibmap_nblocks * sb->block_size);
@@ -660 +660 @@
                 if ((rc = write_block(start_block + i,
                     1, (ibmap_buf8 + i * sb->block_size))) != EOK)
-                        return rc;
+                        goto exit;
         }
 
@@ -668 +668 @@
                 if ((rc = write_block(start_block + i,
                     1, (zbmap_buf8 + i * sb->block_size))) != EOK)
-                        return rc;
+                        goto exit;
         }