X-Git-Url: https://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=ncurses%2Fbase%2Flib_insch.c;h=e21ec02bc84f30d5b2821d453a66ed9f47c305a1;hp=e88b945a741fe178d946694093173bfac4c7daee;hb=91fa4688e82518794fcf0c32a36f3fcca5e4c2d5;hpb=26522e4669dbf45cba32138b5d81c6c292e88e60;ds=inline diff --git a/ncurses/base/lib_insch.c b/ncurses/base/lib_insch.c index e88b945a..e21ec02b 100644 --- a/ncurses/base/lib_insch.c +++ b/ncurses/base/lib_insch.c @@ -43,7 +43,7 @@ #include #include -MODULE_ID("$Id: lib_insch.c,v 1.29 2009/05/30 16:45:16 tom Exp $") +MODULE_ID("$Id: lib_insch.c,v 1.32 2009/10/24 22:04:35 tom Exp $") /* * Insert the given character, updating the current location to simplify @@ -56,13 +56,13 @@ _nc_insert_ch(SCREEN *sp, WINDOW *win, chtype ch) NCURSES_CH_T wch; int count; NCURSES_CONST char *s; - int tabsize = + int tabsize = ( #if USE_REENTRANT - sp->_TABSIZE + sp->_TABSIZE #else - TABSIZE + TABSIZE #endif - ; + ); switch (ch) { case '\t': @@ -119,7 +119,7 @@ _nc_insert_ch(SCREEN *sp, WINDOW *win, chtype ch) wch = _nc_render(win, wch); count = _nc_build_wch(win, &wch); if (count > 0) { - code = wins_wch(win, &wch); + code = _nc_insert_wch(win, &wch); } else if (count == -1) { /* handle EILSEQ */ if (is8bits(ch)) { @@ -153,7 +153,7 @@ winsch(WINDOW *win, chtype c) NCURSES_SIZE_T ox; int code = ERR; - T((T_CALLED("winsch(%p, %s)"), win, _tracechtype(c))); + T((T_CALLED("winsch(%p, %s)"), (void *) win, _tracechtype(c))); if (win != 0) { oy = win->_cury;