[git commit] fbsplash: fix regression from e4fa7b7

Denys Vlasenko vda.linux at googlemail.com
Wed Oct 17 17:39:34 UTC 2012


commit: http://git.busybox.net/busybox/commit/?id=67dc7b21cae44627d0ee55aedb90e421f58ac9c9
branch: http://git.busybox.net/busybox/commit/?id=refs/heads/master

commit e4fa7b7 (limit progress bar flicker) made the progress bar
counter unsigned causing i < 0 to never come true.

Signed-off-by: Timo Teräs <timo.teras at iki.fi>
Signed-off-by: Denys Vlasenko <vda.linux at googlemail.com>
---
 miscutils/fbsplash.c |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/miscutils/fbsplash.c b/miscutils/fbsplash.c
index 37ca665..05a77da 100644
--- a/miscutils/fbsplash.c
+++ b/miscutils/fbsplash.c
@@ -312,8 +312,7 @@ static void fb_drawprogressbar(unsigned percent)
 
 	pos_x = left_x;
 	if (percent > 0) {
-		int y;
-		unsigned i;
+		int i, y;
 
 		// actual progress bar
 		pos_x += (unsigned)(width * percent) / 100;
@@ -325,7 +324,7 @@ static void fb_drawprogressbar(unsigned percent)
 		while (i >= 0) {
 			// draw one-line thick "rectangle"
 			// top line will have gray lvl 200, bottom one 100
-			unsigned gray_level = 100 + i*100 / height;
+			unsigned gray_level = 100 + (unsigned)i*100 / height;
 			fb_drawfullrectangle(
 					left_x, y, pos_x, y,
 					gray_level, gray_level, gray_level);


More information about the busybox-cvs mailing list