Changeset 84239b1 in mainline for kernel

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:

kernel

Files:

• arch/mips32/src/cpu/cpu.c (modified) (2 diffs)
• arch/mips32/src/debug/stacktrace.c (modified) (1 diff)
• genarch/src/ofw/ofw_tree.c (modified) (1 diff)
• generic/src/adt/avl.c (modified) (2 diffs)
• generic/src/console/kconsole.c (modified) (2 diffs)

kernel/arch/mips32/src/cpu/cpu.c

@@ -109 +109 @@
         if (m->arch.imp_num & 0x80) {
                 /* Count records */
-                for (i = 0; imp_data80[i].vendor; i++);
+                i = 0;
+                while (imp_data80[i].vendor)
+                        i++;
                 if ((m->arch.imp_num & 0x7f) >= i) {
                         printf("imp=%d\n", m->arch.imp_num);
@@ -116 +118 @@
                 data = &imp_data80[m->arch.imp_num & 0x7f];
         } else {
-                for (i = 0; imp_data[i].vendor; i++);
+                i = 0;
+                while (imp_data[i].vendor)
+                        i++;
                 if (m->arch.imp_num >= i) {
                         printf("imp=%d\n", m->arch.imp_num);

kernel/arch/mips32/src/debug/stacktrace.c

@@ -159 +159 @@
 
                         /* Seek to the end of this function. */
-                        for (cur = inst + 1; !IS_JR_RA(*cur); cur++)
-                                ;
+                        cur = inst + 1;
+                        while (!IS_JR_RA(*cur))
+                                cur++;
+
                         /* Scan the last basic block */
                         for (cur--; !is_jump(*(cur - 1)); cur--) {

kernel/genarch/src/ofw/ofw_tree.c

@@ -251 +251 @@
 
         for (size_t i = 1; (i < str_size(path)) && (node); i = j + 1) {
-                for (j = i; (j < str_size(path)) && (path[j] != '/'); j++);
+                j = i;
+                while (j < str_size(path) && path[j] != '/')
+                        j++;
 
                 /* Skip extra slashes */

kernel/generic/src/adt/avl.c

@@ -412 +412 @@
                  * node.
                  */
-                for (cur = node->lft; cur->rgt != NULL; cur = cur->rgt)
-                        ;
+                cur = node->lft;
+                while (cur->rgt != NULL)
+                        cur = cur->rgt;
 
                 if (cur != node->lft) {
@@ -462 +463 @@
          * cut-off node up to the root.
          */
-        for (;;) {
+        while (true) {
                 if (dir == LEFT) {
                         /*

kernel/generic/src/console/kconsole.c

@@ -264 +264 @@
                         }
 
-                        for (max_match_len_tmp = 0;
-                            (output[max_match_len_tmp] ==
+                        max_match_len_tmp = 0;
+                        while ((output[max_match_len_tmp] ==
                             hint[max_match_len_tmp]) &&
-                            (max_match_len_tmp < max_match_len); ++max_match_len_tmp);
+                            (max_match_len_tmp < max_match_len))
+                                ++max_match_len_tmp;
 
                         max_match_len = max_match_len_tmp;
@@ -373 +374 @@
                                 beg = 0;
                         } else {
-                                for (beg = position - 1;
-                                    (beg > 0) && (!isspace(current[beg]));
-                                    beg--);
+                                beg = position - 1;
+                                while ((beg > 0) && (!isspace(current[beg])))
+                                    beg--;
 
                                 if (isspace(current[beg]))