ncurses 6.1 - patch 20180825

[ncurses.git] / test / list_keys.c

diff --git a/test/list_keys.c b/test/list_keys.c
index 00460c2d423def0297219f01d4da3d839e0f4937..92c8ba4f012f9e232e797dd2bfdd5d5fe7a89429 100644 (file)
--- a/test/list_keys.c
+++ b/test/list_keys.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 2016,2017 Free Software Foundation, Inc.                   *
+ * Copyright (c) 2016-2017,2018 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: list_keys.c,v 1.20 2017/06/17 21:11:25 tom Exp $
+ * $Id: list_keys.c,v 1.24 2018/05/20 18:56:56 tom Exp $
  *
  * Author: Thomas E Dickey
  *
@@ -209,8 +209,8 @@ draw_line(int width)
 static const char *
 modified_key(const char *name)
 {
-    static char result[80];
-    char buffer[sizeof(result)];
+    static char result[100];
+    char buffer[sizeof(result) - 10];
     int value;
     char chr;
     static const char *modifiers[][2] =
@@ -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';
     }
@@ -298,7 +298,7 @@ list_keys(TERMINAL **terms, int count)
        Type(j) = ktOther;
        if (sscanf(strnames[j], "kf%d", &k) == 1) {
            Type(j) = ktFunction;
-       } else if (!strncmp(strnames[j], "kcu", 3)) {
+       } else if (!(strncmp) (strnames[j], "kcu", 3)) {
            Type(j) = ktCursor;
        }
        Name(j) = strnames[j];