ncurses 6.0 - patch 20170610

[ncurses.git] / test / test_getstr.c

diff --git a/test/test_getstr.c b/test/test_getstr.c
index 25dbecf74136326c34e83f4efad96fc6cf91fe09..4c243092b75460ec9c2d63ba4e12d060548752c8 100644 (file)
--- a/test/test_getstr.c
+++ b/test/test_getstr.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 2007,2008 Free Software Foundation, Inc.                   *
+ * Copyright (c) 2007-2012,2017 Free Software Foundation, Inc.              *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
  * copy of this software and associated documentation files (the            *
@@ -26,7 +26,7 @@
  * authorization.                                                           *
  ****************************************************************************/
 /*
- * $Id: test_getstr.c,v 1.8 2008/02/09 18:09:35 tom Exp $
+ * $Id: test_getstr.c,v 1.11 2017/04/15 14:14:37 tom Exp $
  *
  * Author: Thomas E Dickey
  *
@@ -58,6 +58,15 @@ typedef enum {
     eMaxFlavor
 } Flavors;
 
+/*
+ * Return-code is OK/ERR or a keyname.
+ */
+static const char *
+ok_keyname(int code)
+{
+    return ((code == OK) ? "OK" : ((code == ERR) ? "ERR" : keyname(code)));
+}
+
 static bool
 Quit(int ch)
 {
@@ -132,7 +141,7 @@ ShowFlavor(WINDOW *strwin, WINDOW *txtwin, int flavor, int limit)
 }
 
 static int
-test_getstr(int level, char **argv, WINDOW *strwin)
+recursive_test(int level, char **argv, WINDOW *strwin)
 {
     WINDOW *txtbox = 0;
     WINDOW *txtwin = 0;
@@ -224,7 +233,7 @@ test_getstr(int level, char **argv, WINDOW *strwin)
            break;
 
        case 'w':
-           test_getstr(level + 1, argv, strwin);
+           recursive_test(level + 1, argv, strwin);
            if (txtbox != 0) {
                touchwin(txtbox);
                wnoutrefresh(txtbox);
@@ -271,7 +280,7 @@ test_getstr(int level, char **argv, WINDOW *strwin)
            *buffer = '\0';
            rc = ERR;
            echo();
-           wattrset(txtwin, A_REVERSE);
+           (void) wattrset(txtwin, A_REVERSE);
            switch (flavor) {
            case eGetStr:
                if (txtwin != stdscr) {
@@ -309,8 +318,8 @@ test_getstr(int level, char **argv, WINDOW *strwin)
                break;
            }
            noecho();
-           wattrset(txtwin, A_NORMAL);
-           wprintw(strwin, "%d:%s", rc, buffer);
+           (void) wattrset(txtwin, A_NORMAL);
+           wprintw(strwin, "%s:%s", ok_keyname(rc), buffer);
            wnoutrefresh(strwin);
            break;
        default:
@@ -347,7 +356,7 @@ main(int argc, char *argv[])
 
     strwin = derwin(chrbox, 4, COLS - 2, 1, 1);
 
-    test_getstr(1, argv, strwin);
+    recursive_test(1, argv, strwin);
 
     endwin();
     ExitProgram(EXIT_SUCCESS);