From 6416d96fbc6946a0eee8ba29bb881fbf4dcbe607 Mon Sep 17 00:00:00 2001
From: Franklin Wei <git@fwei.tk>
Date: Sat, 23 Dec 2017 21:23:06 -0500
Subject: fix red

Change-Id: I20f1bd6f0208f6108d68fb59206b09dd9da4f1af
---
 apps/plugins/sdl/sdl.make                             | 2 +-
 apps/plugins/sdl/src/video/rockbox/SDL_rockboxvideo.c | 6 +++---
 apps/plugins/sdl/src/video/rockbox/keymaps_extra.h    | 3 +--
 firmware/common/vuprintf.c                            | 3 +++
 4 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/apps/plugins/sdl/sdl.make b/apps/plugins/sdl/sdl.make
index fedbaa5399..df7ec74ebf 100644
--- a/apps/plugins/sdl/sdl.make
+++ b/apps/plugins/sdl/sdl.make
@@ -23,7 +23,7 @@ OTHER_INC += -I$(SDL_SRCDIR)/include
 # include comes first because of possible system SDL headers taking
 # precedence
 SDLFLAGS = -I$(SDL_SRCDIR)/include $(filter-out -O%,$(PLUGINFLAGS))	\
--O3 -Wno-unused-parameter -Xpreprocessor -Wno-undef -Wcast-align
+-O3 -Wno-unused-parameter -Xpreprocessor -Wno-undef -Wcast-align -w
 
 ifndef APP_TYPE
     ### no target has a big enough plugin buffer
diff --git a/apps/plugins/sdl/src/video/rockbox/SDL_rockboxvideo.c b/apps/plugins/sdl/src/video/rockbox/SDL_rockboxvideo.c
index 2f16f3cd8b..58de15754d 100644
--- a/apps/plugins/sdl/src/video/rockbox/SDL_rockboxvideo.c
+++ b/apps/plugins/sdl/src/video/rockbox/SDL_rockboxvideo.c
@@ -669,12 +669,12 @@ static void ROCKBOX_UnlockHWSurface(_THIS, SDL_Surface *surface)
 #if LCD_PIXELFORMAT == RGB565SWAPPED
 static void flip_pixels(int x, int y, int w, int h)
 {
-    for(int y = rects[i].y; y < rects[i].y + rects[i].h; ++y)
+    for(int y_0 = y; y_0 < y + h; ++y_0)
     {
-        for(int x = rects[i].x; x < rects[i].x + rects[i].w; ++x)
+        for(int x_0 = x; x_0 < x + w; ++x_0)
         {
             /* swap pixels directly in the framebuffer */
-            rb->lcd_framebuffer[y * LCD_WIDTH + x] = swap16(rb->lcd_framebuffer[y * LCD_WIDTH + x]);
+            rb->lcd_framebuffer[y_0 * LCD_WIDTH + x_0] = swap16(rb->lcd_framebuffer[y_0 * LCD_WIDTH + x_0]);
         }
     }
 }
diff --git a/apps/plugins/sdl/src/video/rockbox/keymaps_extra.h b/apps/plugins/sdl/src/video/rockbox/keymaps_extra.h
index a205262c33..2da5c0e69d 100644
--- a/apps/plugins/sdl/src/video/rockbox/keymaps_extra.h
+++ b/apps/plugins/sdl/src/video/rockbox/keymaps_extra.h
@@ -25,8 +25,7 @@
 #ifndef _SDL_KEYMAPS_EXTRA_H
 #define _SDL_KEYMAPS_EXTRA_H
 
-#if (CONFIG_KEYPAD == GIGABEAT_PAD)      ||      \
-      (CONFIG_KEYPAD == GIGABEAT_S_PAD)
+#if (CONFIG_KEYPAD == GIGABEAT_S_PAD)
 #define BTN_EXTRA1 BUTTON_SELECT
 #define BTN_EXTRA2 BUTTON_BACK
 #define BTN_EXTRA3 BUTTON_VOL_DOWN
diff --git a/firmware/common/vuprintf.c b/firmware/common/vuprintf.c
index becb05e136..a4b3c72680 100644
--- a/firmware/common/vuprintf.c
+++ b/firmware/common/vuprintf.c
@@ -23,6 +23,7 @@
 #include <limits.h>
 #include <string.h>
 #include <stddef.h>
+#include <stdio.h> /* for snprintf */
 #include "system.h"
 #include "vuprintf.h"
 
@@ -533,6 +534,8 @@ static const char * format_f(double f,
                              int radixchar,
                              bool *numericp)
 {
+    (void) radixchar;
+    (void) numericp;
     fmt_buf->length = snprintf(fmt_buf->buf, 24, "%d.%06d", (int)f, ABS((int)((f - (int)f)*1e6)));
     return fmt_buf->buf;
 }
-- 
cgit v1.2.3