ncurses 6.0 - patch 20161126

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

diff --git a/ncurses/tinfo/lib_ti.c b/ncurses/tinfo/lib_ti.c
index 76001d2c11acb39b539aa31668ebee47a4a5d4a6..d900737b76372abe9d7d292d8f5da20df0f052f1 100644 (file)
--- a/ncurses/tinfo/lib_ti.c
+++ b/ncurses/tinfo/lib_ti.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 1998-2003,2009 Free Software Foundation, Inc.              *
+ * Copyright (c) 1998-2013,2016 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            *
@@ -34,10 +34,9 @@
 
 #include <curses.priv.h>
 
-#include <term_entry.h>
 #include <tic.h>
 
-MODULE_ID("$Id: lib_ti.c,v 1.26 2009/07/11 18:14:21 tom Exp $")
+MODULE_ID("$Id: lib_ti.c,v 1.31 2016/05/28 23:22:52 tom Exp $")
 
 #if 0
 static bool
@@ -54,13 +53,13 @@ NCURSES_EXPORT(int)
 NCURSES_SP_NAME(tigetflag) (NCURSES_SP_DCLx NCURSES_CONST char *str)
 {
     int result = ABSENT_BOOLEAN;
-    int i, j;
 
-    T((T_CALLED("tigetflag(%p, %s)"), SP_PARM, str));
+    T((T_CALLED("tigetflag(%p, %s)"), (void *) SP_PARM, str));
 
     if (HasTInfoTerminal(SP_PARM)) {
        TERMTYPE *tp = &(TerminalOf(SP_PARM)->type);
        struct name_table_entry const *entry_ptr;
+       int j = -1;
 
        entry_ptr = _nc_find_type_entry(str, BOOLEAN, FALSE);
        if (entry_ptr != 0) {
@@ -68,7 +67,7 @@ NCURSES_SP_NAME(tigetflag) (NCURSES_SP_DCLx NCURSES_CONST char *str)
        }
 #if NCURSES_XNAMES
        else {
-           j = -1;
+           int i;
            for_each_ext_boolean(i, tp) {
                const char *capname = ExtBoolname(tp, i, boolnames);
                if (same_name(str, capname)) {
@@ -98,14 +97,14 @@ tigetflag(NCURSES_CONST char *str)
 NCURSES_EXPORT(int)
 NCURSES_SP_NAME(tigetnum) (NCURSES_SP_DCLx NCURSES_CONST char *str)
 {
-    int i, j;
     int result = CANCELLED_NUMERIC;    /* Solaris returns a -1 on error */
 
-    T((T_CALLED("tigetnum(%p, %s)"), SP_PARM, str));
+    T((T_CALLED("tigetnum(%p, %s)"), (void *) SP_PARM, str));
 
     if (HasTInfoTerminal(SP_PARM)) {
        TERMTYPE *tp = &(TerminalOf(SP_PARM)->type);
        struct name_table_entry const *entry_ptr;
+       int j = -1;
 
        entry_ptr = _nc_find_type_entry(str, NUMBER, FALSE);
        if (entry_ptr != 0) {
@@ -113,7 +112,7 @@ NCURSES_SP_NAME(tigetnum) (NCURSES_SP_DCLx NCURSES_CONST char *str)
        }
 #if NCURSES_XNAMES
        else {
-           j = -1;
+           int i;
            for_each_ext_number(i, tp) {
                const char *capname = ExtNumname(tp, i, numnames);
                if (same_name(str, capname)) {
@@ -123,10 +122,12 @@ NCURSES_SP_NAME(tigetnum) (NCURSES_SP_DCLx NCURSES_CONST char *str)
            }
        }
 #endif
-       if (j >= 0 && VALID_NUMERIC(tp->Numbers[j]))
-           result = tp->Numbers[j];
-       else
-           result = ABSENT_NUMERIC;
+       if (j >= 0) {
+           if (VALID_NUMERIC(tp->Numbers[j]))
+               result = tp->Numbers[j];
+           else
+               result = ABSENT_NUMERIC;
+       }
     }
 
     returnCode(result);
@@ -144,13 +145,13 @@ NCURSES_EXPORT(char *)
 NCURSES_SP_NAME(tigetstr) (NCURSES_SP_DCLx NCURSES_CONST char *str)
 {
     char *result = CANCELLED_STRING;
-    int i, j;
 
-    T((T_CALLED("tigetstr(%p, %s)"), SP_PARM, str));
+    T((T_CALLED("tigetstr(%p, %s)"), (void *) SP_PARM, str));
 
     if (HasTInfoTerminal(SP_PARM)) {
        TERMTYPE *tp = &(TerminalOf(SP_PARM)->type);
        struct name_table_entry const *entry_ptr;
+       int j = -1;
 
        entry_ptr = _nc_find_type_entry(str, STRING, FALSE);
        if (entry_ptr != 0) {
@@ -158,7 +159,7 @@ NCURSES_SP_NAME(tigetstr) (NCURSES_SP_DCLx NCURSES_CONST char *str)
        }
 #if NCURSES_XNAMES
        else {
-           j = -1;
+           int i;
            for_each_ext_string(i, tp) {
                const char *capname = ExtStrname(tp, i, strnames);
                if (same_name(str, capname)) {