diff options
| author | Patrick Georgi <patrick@georgi-clan.de> | 2011-04-21 18:57:16 +0200 |
|---|---|---|
| committer | Uwe Hermann <uwe@hermann-uwe.de> | 2011-06-30 20:41:23 +0200 |
| commit | 7f96583f0f6b9829f73fb8afbb6f367323446030 (patch) | |
| tree | 4c26b124a3c077cf1419f143bf29e89ea2d528e2 /payloads/libpayload/curses | |
| parent | b3db79e9965cb290615a02b324648bc64f805660 (diff) | |
Reduce warnings/errors in libpayload when using picky compiler options
The new build system uses quite a few more -W flags for the compiler by
default than the old one. And that's for the better.
Change-Id: Ia8e3d28fb35c56760c2bd0983046c7067e8c5dd6
Signed-off-by: Patrick Georgi <patrick@georgi-clan.de>
Reviewed-on: http://review.coreboot.org/72
Tested-by: build bot (Jenkins)
Reviewed-by: Uwe Hermann <uwe@hermann-uwe.de>
Diffstat (limited to 'payloads/libpayload/curses')
| -rw-r--r-- | payloads/libpayload/curses/keyboard.c | 20 | ||||
| -rw-r--r-- | payloads/libpayload/curses/tinycurses.c | 2 |
2 files changed, 11 insertions, 11 deletions
diff --git a/payloads/libpayload/curses/keyboard.c b/payloads/libpayload/curses/keyboard.c index a750675995..7ebb04f111 100644 --- a/payloads/libpayload/curses/keyboard.c +++ b/payloads/libpayload/curses/keyboard.c @@ -71,7 +71,7 @@ static int getkeyseq(char *buffer, int len, int max) } static struct { - char *seq; + const char *seq; int key; } escape_codes[] = { { "[A", KEY_UP }, @@ -109,7 +109,7 @@ static int handle_escape(void) return 27; for(i = 0; escape_codes[i].seq != NULL; i++) { - char *p = escape_codes[i].seq; + const char *p = escape_codes[i].seq; for(t = 0; t < len; t++) { if (!*p || *p != buffer[t]) @@ -144,7 +144,7 @@ static int cook_serial(unsigned char ch) /* ================ Keyboard ================ */ -static int curses_getchar(int delay) +static int curses_getchar(int _delay) { #if defined(CONFIG_USB_HID) || defined(CONFIG_PC_KEYBOARD) || defined(CONFIG_SERIAL_CONSOLE) unsigned short c; @@ -175,12 +175,12 @@ static int curses_getchar(int delay) } #endif - if (delay == 0) + if (_delay == 0) break; - if (delay > 0) { + if (_delay > 0) { mdelay(1); - delay--; + _delay--; } @@ -193,14 +193,14 @@ static int curses_getchar(int delay) int wgetch(WINDOW *win) { - int delay = -1; + int _delay = -1; if (_halfdelay) - delay = _halfdelay; + _delay = _halfdelay; else - delay = win->_delay; + _delay = win->_delay; - return curses_getchar(delay); + return curses_getchar(_delay); } int nodelay(WINDOW *win, NCURSES_BOOL flag) diff --git a/payloads/libpayload/curses/tinycurses.c b/payloads/libpayload/curses/tinycurses.c index cb1d695933..4d3e8e1be2 100644 --- a/payloads/libpayload/curses/tinycurses.c +++ b/payloads/libpayload/curses/tinycurses.c @@ -971,7 +971,7 @@ int wsetscrreg(WINDOW *win, int top, int bottom) } // void wsyncdown (WINDOW *) {} // void wsyncup (WINDOW *) {} -/* D */ void wtimeout(WINDOW *win, int delay) { win->_delay = delay; } +/* D */ void wtimeout(WINDOW *win, int _delay) { win->_delay = _delay; } /* D */ int wtouchln(WINDOW *win, int y, int n, int changed) { int i; |