ncurses 6.1 - patch 20180127

[ncurses.git] / test / list_keys.c

diff --git a/test/list_keys.c b/test/list_keys.c
index 759469500a40a92f97537dce4ad7795132819681..6df2b0789da72dd8d9efe9e75b6360a66f221f47 100644 (file)
--- a/test/list_keys.c
+++ b/test/list_keys.c
@@ -26,7 +26,7 @@
  * authorization.                                                           *
  ****************************************************************************/
 /*
- * $Id: list_keys.c,v 1.18 2017/03/18 22:03:07 tom Exp $
+ * $Id: list_keys.c,v 1.22 2017/08/12 17:28:23 tom Exp $
  *
  * Author: Thomas E Dickey
  *
@@ -89,7 +89,7 @@ show_key(const char *name, bool show)
 {
     int width = 0;
     char buffer[10];
-    NCURSES_CONST char *value = tigetstr(name);
+    NCURSES_CONST char *value = tigetstr((NCURSES_CONST char *) name);
 
     if (show && t_opt)
        fputc('"', stdout);
@@ -159,7 +159,7 @@ show_key(const char *name, bool show)
 }
 
 static bool
-valid_key(const char *name, TERMINAL ** terms, int count)
+valid_key(const char *name, TERMINAL **terms, int count)
 {
     bool result = FALSE;
     if (*name == 'k') {
@@ -238,7 +238,7 @@ modified_key(const char *name)
        map &= ~6;
        map |= (bit1 << 1) | (bit2 >> 1);
        _nc_SPRINTF(result, _nc_SLIMIT(sizeof(result))
-                   "%sF%d", modifiers[map][f_opt], 1 + key);
+                   "%sF%d", modifiers[map][(unsigned) f_opt], 1 + key);
     } else if (sscanf(name, "k%[A-Z]%d%c", buffer, &value, &chr) == 2 &&
               (value > 1 &&
                value <= 8) &&
@@ -253,12 +253,12 @@ modified_key(const char *name)
                !strcmp(buffer, "NXT") ||
                !strcmp(buffer, "PRV"))) {
        _nc_SPRINTF(result, _nc_SLIMIT(sizeof(result))
-                   "%sk%s", modifiers[value - 1][f_opt], buffer);
+                   "%sk%s", modifiers[value - 1][(unsigned) f_opt], buffer);
     } else if (sscanf(name, "k%[A-Z]%c", buffer, &chr) == 1 &&
               (!strcmp(buffer, "UP") ||
                !strcmp(buffer, "DN"))) {
        _nc_SPRINTF(result, _nc_SLIMIT(sizeof(result))
-                   "%sk%s", modifiers[1][f_opt], buffer);
+                   "%sk%s", modifiers[1][(unsigned) f_opt], buffer);
     } else {
        *result = '\0';
     }
@@ -266,7 +266,7 @@ modified_key(const char *name)
 }
 
 static void
-list_keys(TERMINAL ** terms, int count)
+list_keys(TERMINAL **terms, int count)
 {
     int j, k;
     int widths0 = 0;
@@ -486,6 +486,8 @@ main(int argc, char *argv[])
        list_keys(terms, 1);
     }
 
+    free(terms);
+
     ExitProgram(EXIT_SUCCESS);
 }