ncurses 6.2 - patch 20200531

[ncurses.git] / ncurses / base / lib_insch.c

diff --git a/ncurses/base/lib_insch.c b/ncurses/base/lib_insch.c
index 2d7c63797cce0061c980d148d4785af93d27dee0..894605ccfa98cfc14944fa85d3158dac5543a6ec 100644 (file)
--- a/ncurses/base/lib_insch.c
+++ b/ncurses/base/lib_insch.c
@@ -1,5 +1,6 @@
 /****************************************************************************
- * Copyright (c) 1998-2009,2012 Free Software Foundation, Inc.              *
+ * Copyright 2020 Thomas E. Dickey                                          *
+ * Copyright 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            *
@@ -43,7 +44,7 @@
 #include <curses.priv.h>
 #include <ctype.h>
 
-MODULE_ID("$Id: lib_insch.c,v 1.34 2013/05/11 18:56:44 tom Exp $")
+MODULE_ID("$Id: lib_insch.c,v 1.37 2020/02/02 23:34:34 tom Exp $")
 
 /*
  * Insert the given character, updating the current location to simplify
@@ -56,7 +57,6 @@ _nc_insert_ch(SCREEN *sp, WINDOW *win, chtype ch)
     int ch8 = (int) ChCharOf(ch);
     NCURSES_CH_T wch;
     int count;
-    NCURSES_CONST char *s;
     int tabsize = (
 #if USE_REENTRANT
                      sp->_TABSIZE
@@ -102,7 +102,8 @@ _nc_insert_ch(SCREEN *sp, WINDOW *win, chtype ch)
                win->_curx++;
            }
        } else if (iscntrl(ch8)) {
-           s = NCURSES_SP_NAME(unctrl) (NCURSES_SP_ARGx ch8);
+           NCURSES_CONST char *s;
+           s = NCURSES_SP_NAME(unctrl) (NCURSES_SP_ARGx (chtype) ch8);
            while (*s != '\0') {
                code = _nc_insert_ch(sp, win, ChAttrOf(ch) | UChar(*s));
                if (code != OK)
@@ -121,8 +122,9 @@ _nc_insert_ch(SCREEN *sp, WINDOW *win, chtype ch)
            if (count > 0) {
                code = _nc_insert_wch(win, &wch);
            } else if (count == -1) {
+               NCURSES_CONST char *s;
                /* handle EILSEQ */
-               s = NCURSES_SP_NAME(unctrl) (NCURSES_SP_ARGx ch8);
+               s = NCURSES_SP_NAME(unctrl) (NCURSES_SP_ARGx (chtype) ch8);
                if (strlen(s) > 1) {
                    while (*s != '\0') {
                        code = _nc_insert_ch(sp, win,
@@ -145,15 +147,13 @@ _nc_insert_ch(SCREEN *sp, WINDOW *win, chtype ch)
 NCURSES_EXPORT(int)
 winsch(WINDOW *win, chtype c)
 {
-    NCURSES_SIZE_T oy;
-    NCURSES_SIZE_T ox;
     int code = ERR;
 
     T((T_CALLED("winsch(%p, %s)"), (void *) win, _tracechtype(c)));
 
     if (win != 0) {
-       oy = win->_cury;
-       ox = win->_curx;
+       NCURSES_SIZE_T oy = win->_cury;
+       NCURSES_SIZE_T ox = win->_curx;
 
        code = _nc_insert_ch(_nc_screen_of(win), win, c);