Changeset 84239b1 in mainline for boot

Timestamp:

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

boot

Files:

• genarch/src/ofw_tree.c (modified) (1 diff)
• generic/src/printf_core.c (modified) (5 diffs)

boot/genarch/src/ofw_tree.c

@@ -110 +110 @@
                 /* Find last slash */
                 size_t i;
-                for (i = len; (i > 0) && (path[i - 1] != '/'); i--);
+                i = len;
+                while (i > 0 && path[i - 1] != '/')
+                        i--;
 
                 /* Do not include the slash */

boot/generic/src/printf_core.c

@@ -670 +670 @@
                                 counter += retval;
                                 j = nxt;
-                                goto next_char;
+                                continue;
                         case 'c':
                                 retval = print_char(va_arg(ap, unsigned int), width, flags, ps);
@@ -677 +677 @@
                                         counter = -counter;
                                         goto out;
-                                };
+                                }
 
                                 counter += retval;
                                 j = nxt;
-                                goto next_char;
+                                continue;
 
                         /*
@@ -718 +718 @@
                         case '%':
                                 j = i;
-                                goto next_char;
+                                continue;
 
                         /*
@@ -728 +728 @@
                                  * so we will print whole bad format sequence.
                                  */
-                                goto next_char;
+                                continue;
                         }
 
@@ -784 +784 @@
                         j = nxt;
                 }
-next_char:
-                ;
         }