ncurses 6.2 - patch 20200627

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

diff --git a/ncurses/tinfo/lib_has_cap.c b/ncurses/tinfo/lib_has_cap.c
index d1b9b8d966dab60d567e5486cfe98d884d0a543a..cbf68b3165082e604aa594149c57e86aeee06dd6 100644 (file)
--- a/ncurses/tinfo/lib_has_cap.c
+++ b/ncurses/tinfo/lib_has_cap.c
@@ -1,5 +1,6 @@
 /****************************************************************************
- * Copyright (c) 1998-2003,2009 Free Software Foundation, Inc.              *
+ * Copyright 2020 Thomas E. Dickey                                          *
+ * Copyright 1998-2009,2013 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            *
@@ -46,7 +47,7 @@
 #define CUR SP_TERMTYPE
 #endif
 
-MODULE_ID("$Id: lib_has_cap.c,v 1.9 2009/10/24 22:15:47 tom Exp $")
+MODULE_ID("$Id: lib_has_cap.c,v 1.11 2020/02/02 23:34:34 tom Exp $")
 
 NCURSES_EXPORT(bool)
 NCURSES_SP_NAME(has_ic) (NCURSES_SP_DCL0)
@@ -55,7 +56,7 @@ NCURSES_SP_NAME(has_ic) (NCURSES_SP_DCL0)
 
     T((T_CALLED("has_ic(%p)"), (void *) SP_PARM));
 
-    if (IsValidTIScreen(SP_PARM) && IsTermInfo(SP_PARM)) {
+    if (HasTInfoTerminal(SP_PARM)) {
        code = ((insert_character || parm_ich
                 || (enter_insert_mode && exit_insert_mode))
                && (delete_character || parm_dch)) ? TRUE : FALSE;
@@ -77,7 +78,7 @@ NCURSES_SP_NAME(has_il) (NCURSES_SP_DCL0)
 {
     bool code = FALSE;
     T((T_CALLED("has_il(%p)"), (void *) SP_PARM));
-    if (IsValidTIScreen(SP_PARM) && IsTermInfo(SP_PARM)) {
+    if (HasTInfoTerminal(SP_PARM)) {
        code = ((insert_line || parm_insert_line)
                && (delete_line || parm_delete_line)) ? TRUE : FALSE;
     }