Changeset 850fd32 in mainline for kernel

Timestamp:

2018-03-11T01:21:19Z (7 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

84239b1, f0e825d

Parents:

338d54a7

Message:

Fix mischievious semicolons.

Location:

kernel/generic/src

Files:

• adt/btree.c (modified) (4 diffs)
• printf/printf_core.c (modified) (1 diff)

kernel/generic/src/adt/btree.c

@@ -877 +877 @@
 {
         btree_node_t *cur, *next;
+        bool descend;
 
         /*
@@ -907 +908 @@
                          * or it is not in the tree at all.
                          */
+                        descend = false;
                         for (i = 1; i < cur->keys; i++) {
                                 if (key < cur->key[i]) {
@@ -915 +917 @@
                                                 return key == cur->key[i - 1] ? val : NULL;
 
-                                        goto descend;
+                                        descend = true;
+                                        break;
                                 }
                         }
+
+                        if (descend)
+                                continue;
 
                         /*
@@ -929 +935 @@
                                 return key == cur->key[i - 1] ? val : NULL;
                 }
-descend:
-                ;
         }
 

kernel/generic/src/printf/printf_core.c

@@ -674 +674 @@
                                 default:
                                         end = true;
-                                };
+                                }
                         } while (!end);