ncurses 5.6 - patch 20080119

[ncurses.git] / ncurses / tinfo / init_keytry.c

diff --git a/ncurses/tinfo/init_keytry.c b/ncurses/tinfo/init_keytry.c
index c151fd9fd33fd4e975ba14242a3866177143fff8..d203210615541ed6a496b26a2f84e6aaee496cf5 100644 (file)
--- a/ncurses/tinfo/init_keytry.c
+++ b/ncurses/tinfo/init_keytry.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 1999-2000,2005 Free Software Foundation, Inc.              *
+ * Copyright (c) 1999-2005,2006 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            *
@@ -36,7 +36,7 @@
 
 #include <term_entry.h>
 
-MODULE_ID("$Id: init_keytry.c,v 1.7 2005/04/30 19:32:03 tom Exp $")
+MODULE_ID("$Id: init_keytry.c,v 1.10 2007/04/29 22:57:50 tom Exp $")
 
 /*
 **      _nc_init_keytry()
@@ -56,7 +56,7 @@ MODULE_ID("$Id: init_keytry.c,v 1.7 2005/04/30 19:32:03 tom Exp $")
 #endif*/
 
 #if    BROKEN_LINKER
-struct tinfo_fkeys *
+const struct tinfo_fkeys *
 _nc_tinfo_fkeysf(void)
 {
     return _nc_tinfo_fkeys;
@@ -76,9 +76,9 @@ _nc_init_keytry(void)
     if (SP != 0) {
        for (n = 0; _nc_tinfo_fkeys[n].code; n++) {
            if (_nc_tinfo_fkeys[n].offset < STRCOUNT) {
-               _nc_add_to_try(&(SP->_keytry),
-                              CUR Strings[_nc_tinfo_fkeys[n].offset],
-                              _nc_tinfo_fkeys[n].code);
+               (void) _nc_add_to_try(&(SP->_keytry),
+                                     CUR Strings[_nc_tinfo_fkeys[n].offset],
+                                     _nc_tinfo_fkeys[n].code);
            }
        }
 #if NCURSES_XNAMES
@@ -90,15 +90,15 @@ _nc_init_keytry(void)
        {
            TERMTYPE *tp = &(SP->_term->type);
            for (n = STRCOUNT; n < NUM_STRINGS(tp); ++n) {
-               char *name = ExtStrname(tp, n, strnames);
+               const char *name = ExtStrname(tp, n, strnames);
                char *value = tp->Strings[n];
                if (name != 0
                    && *name == 'k'
                    && value != 0
                    && key_defined(value) == 0) {
-                   _nc_add_to_try(&(SP->_keytry),
-                                  value,
-                                  n - STRCOUNT + KEY_MAX);
+                   (void) _nc_add_to_try(&(SP->_keytry),
+                                         value,
+                                         n - STRCOUNT + KEY_MAX);
                }
            }
        }