Changeset 0464967 in mainline for uspace/app

Timestamp:

2017-10-20T00:31:52Z (8 years ago)

Author:

jzr <zarevucky.jiri@…>

Branches:

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

Children:

04efacc

Parents:

c212a03 (diff), ccbf93f (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:

Fix gcc warnings when building with -O1 or -Og flags.
(Thanks Ondřej Hlavatý!)

Location:

uspace/app

Files:

• mkmfs/mkmfs.c (modified) (2 diffs)
• sbi/src/os/helenos.c (modified) (1 diff)
• sbi/src/run_expr.c (modified) (2 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);

uspace/app/sbi/src/os/helenos.c

@@ -155 +155 @@
         size_t offset;
         int i;
-        wchar_t c;
+        wchar_t c = 0;
 
         if (index < 0)

uspace/app/sbi/src/run_expr.c

@@ -2504 +2504 @@
         elem_index = 0;
 
+        assert(node != NULL);
+
         i = 0;
-        while (node != NULL) {
+        do {
                 if (i >= 1) {
                         printf("Error: Too many indices string.\n");
@@ -2527 +2529 @@
                 node = list_next(args, node);
                 i += 1;
-        }
+        } while (node != NULL);
 
         if (i < 1) {