diff options
| author | Stefan Reinauer <stepan@coresystems.de> | 2009-04-29 19:10:10 +0000 |
|---|---|---|
| committer | Stefan Reinauer <stepan@openbios.org> | 2009-04-29 19:10:10 +0000 |
| commit | 2c9617dc945c8e1aa2a38e287908630fcb217869 (patch) | |
| tree | e501e12ed0b1ec2e5b10c731c80fa775495c0c05 | |
| parent | 0ae0bcefe1aecb34b6903f0d3aa08e317dea4215 (diff) | |
Mostly cosmetical changes.
- #if 0 some incomplete, non-working code instead of failing half way through
the function
- Don't read a NULL pointer in wclrtoeol
Signed-off-by: Stefan Reinauer <stepan@coresystems.de>
Acked-by: Patrick Georgi <patrick.georgi@coresystems.de>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@4230 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
| -rw-r--r-- | payloads/libpayload/curses/tinycurses.c | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/payloads/libpayload/curses/tinycurses.c b/payloads/libpayload/curses/tinycurses.c index f6c14a4c45..b4c9213ece 100644 --- a/payloads/libpayload/curses/tinycurses.c +++ b/payloads/libpayload/curses/tinycurses.c @@ -3,7 +3,7 @@ * * Copyright (C) 2007 Uwe Hermann <uwe@hermann-uwe.de> * Copyright (C) 2008 Ulf Jordan <jordan@chalmers.se> - * Copyright (C) 2008 coresystems GmbH + * Copyright (C) 2008-2009 coresystems GmbH * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -232,6 +232,7 @@ int delwin(WINDOW *win) } WINDOW *derwin(WINDOW *orig, int num_lines, int num_columns, int begy, int begx) { +#if 0 WINDOW *win = NULL; int i; int flags = _SUBWIN; @@ -255,9 +256,9 @@ WINDOW *derwin(WINDOW *orig, int num_lines, int num_columns, int begy, int begx) flags |= _ISPAD; // FIXME - //// if ((win = _nc_makenew(num_lines, num_columns, orig->_begy + begy, - //// orig->_begx + begx, flags)) == 0) - //// return NULL; + if ((win = _nc_makenew(num_lines, num_columns, orig->_begy + begy, + orig->_begx + begx, flags)) == 0) + return NULL; win->_pary = begy; win->_parx = begx; @@ -270,6 +271,9 @@ WINDOW *derwin(WINDOW *orig, int num_lines, int num_columns, int begy, int begx) win->_parent = orig; return win; +#else + return NULL; +#endif } int doupdate(void) { /* TODO */ return(0); } // WINDOW * dupwin (WINDOW *) {} @@ -614,7 +618,7 @@ int wborder(WINDOW *win, chtype ls, chtype rs, chtype ts, chtype bs, return OK; } // int wclrtobot (WINDOW *) {} -int wclrtoeol(WINDOW *win) { /* TODO */ return(*(int *)0); } +int wclrtoeol(WINDOW *win) { /* TODO */ return ERR; } int wcolor_set(WINDOW *win, short color_pair_number, void *opts) { if (!opts && (color_pair_number >= 0) |