__nonnull changes

[people/xl0/gpxe.git] / src / hci / mucurses / ansi_screen.c

diff --git a/src/hci/mucurses/ansi_screen.c b/src/hci/mucurses/ansi_screen.c
index b230b2b..0742a7d 100644 (file)
--- a/src/hci/mucurses/ansi_screen.c
+++ b/src/hci/mucurses/ansi_screen.c
@@ -1,10 +1,16 @@
+#include <stdio.h>
 #include <curses.h>
 #include <console.h>
 
+static void ansiscr_reset(struct _curses_screen *scr) __nonnull;
+static void ansiscr_movetoyx(struct _curses_screen *scr,
+                               unsigned int y, unsigned int x) __nonnull;
+static void ansiscr_putc(struct _curses_screen *scr, chtype c) __nonnull;
+
 unsigned short _COLS = 80;
 unsigned short _LINES = 24;
 
-static void ansiscr_init ( struct _curses_screen *scr ) {
+static void ansiscr_reset ( struct _curses_screen *scr ) {
        /* Reset terminal attributes and clear screen */
        scr->attrs = 0;
        scr->curs_x = 0;
@@ -12,9 +18,6 @@ static void ansiscr_init ( struct _curses_screen *scr ) {
        printf ( "\033[0m\033[2J\033[1;1H" );
 }
 
-static void ansiscr_exit ( struct _curses_screen *scr __unused ) {
-}
-
 static void ansiscr_movetoyx ( struct _curses_screen *scr,
                               unsigned int y, unsigned int x ) {
        if ( ( x != scr->curs_x ) || ( y != scr->curs_y ) ) {
@@ -60,8 +63,8 @@ static bool ansiscr_peek ( struct _curses_screen *scr __unused ) {
 }
 
 SCREEN _ansi_screen = {
-       .init           = ansiscr_init,
-       .exit           = ansiscr_exit,
+       .init           = ansiscr_reset,
+       .exit           = ansiscr_reset,
        .movetoyx       = ansiscr_movetoyx,
        .putc           = ansiscr_putc,
        .getc           = ansiscr_getc,