Remove null checks for arguments declared as nonnull.
[BUILD] bin/windows.o
hci/mucurses/windows.c: In function ‘delwin’:
hci/mucurses/windows.c:21:5: error: nonnull argument ‘win’ compared to NULL
[-Werror=nonnull-compare]
if ( win == NULL )
^
hci/mucurses/windows.c: In function ‘derwin’:
hci/mucurses/windows.c:54:5: error: nonnull argument ‘parent’ compared to NULL
[-Werror=nonnull-compare]
if ( parent == NULL )
^
hci/mucurses/windows.c: In function ‘dupwin’:
hci/mucurses/windows.c:78:5: error: nonnull argument ‘orig’ compared to NULL
[-Werror=nonnull-compare]
if ( orig == NULL )
^
hci/mucurses/windows.c: In function ‘mvwin’:
hci/mucurses/windows.c:102:5: error: nonnull argument ‘win’ compared to NULL
[-Werror=nonnull-compare]
if ( win == NULL )
^
hci/mucurses/windows.c: In function ‘subwin’:
hci/mucurses/windows.c:152:5: error: nonnull argument ‘parent’ compared to NULL
[-Werror=nonnull-compare]
if ( parent == NULL )
^
Fixes: d39e79248c2d ("__nonnull changes")
Signed-off-by: Vinson Lee <v...@freedesktop.org>
---
src/hci/mucurses/windows.c | 11 -----------
1 file changed, 11 deletions(-)
diff --git a/src/hci/mucurses/windows.c b/src/hci/mucurses/windows.c
index 7f39bdea2b7d..5f5d1f4e2a16 100644
--- a/src/hci/mucurses/windows.c
+++ b/src/hci/mucurses/windows.c
@@ -18,9 +18,6 @@ FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
* @ret rc return status code
*/
int delwin ( WINDOW *win ) {
- if ( win == NULL )
- return ERR;
-
/* I think we should blank the region covered by the window -
ncurses doesn't do this, but they have a buffer, so they
may just be deleting from an offscreen context whereas we
@@ -51,8 +48,6 @@ int delwin ( WINDOW *win ) {
WINDOW *derwin ( WINDOW *parent, int nlines, int ncols,
int begin_y, int begin_x ) {
WINDOW *child;
- if ( parent == NULL )
- return NULL;
if ( ( child = malloc( sizeof( WINDOW ) ) ) == NULL )
return NULL;
if ( ( (unsigned)ncols > parent->width ) ||
@@ -75,8 +70,6 @@ WINDOW *derwin ( WINDOW *parent, int nlines, int ncols,
*/
WINDOW *dupwin ( WINDOW *orig ) {
WINDOW *copy;
- if ( orig == NULL )
- return NULL;
if ( ( copy = malloc( sizeof( WINDOW ) ) ) == NULL )
return NULL;
copy->scr = orig->scr;
@@ -99,8 +92,6 @@ WINDOW *dupwin ( WINDOW *orig ) {
* @ret rc return status code
*/
int mvwin ( WINDOW *win, int y, int x ) {
- if ( win == NULL )
- return ERR;
if ( ( ( (unsigned)y + win->height ) > LINES ) ||
( ( (unsigned)x + win->width ) > COLS ) )
return ERR;
@@ -149,8 +140,6 @@ WINDOW *newwin ( int nlines, int ncols, int begin_y, int
begin_x ) {
WINDOW *subwin ( WINDOW *parent, int nlines, int ncols,
int begin_y, int begin_x ) {
WINDOW *child;
- if ( parent == NULL )
- return NULL;
if ( ( child = malloc( sizeof( WINDOW ) ) ) == NULL )
return NULL;
child = newwin( nlines, ncols, begin_y, begin_x );
--
2.7.1
_______________________________________________
ipxe-devel mailing list
ipxe-devel@lists.ipxe.org
https://lists.ipxe.org/mailman/listinfo.cgi/ipxe-devel
