X-Git-Url: https://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=ncurses%2Ftty%2Ftty_update.c;h=02ec46264f31cee511affe38ae93d9cd0d62cbe4;hp=7a4c197efd6807887297e85d9e9c0ec24d7ea50a;hb=cf94c7485f7b40ff7870b5bf9a65e7ab87481a76;hpb=3f5a74a97cf8d86a8a8a78c7b268f49ccdc4101c;ds=sidebyside diff --git a/ncurses/tty/tty_update.c b/ncurses/tty/tty_update.c index 7a4c197e..02ec4626 100644 --- a/ncurses/tty/tty_update.c +++ b/ncurses/tty/tty_update.c @@ -82,7 +82,7 @@ #include -MODULE_ID("$Id: tty_update.c,v 1.258.1.2 2009/08/16 14:20:30 tom Exp tom $") +MODULE_ID("$Id: tty_update.c,v 1.262 2009/10/24 23:21:31 tom Exp $") /* * This define controls the line-breakout optimization. Every once in a @@ -193,7 +193,7 @@ static NCURSES_INLINE void GoTo(NCURSES_SP_DCLx int const row, int const col) { TR(TRACE_MOVE, ("GoTo(%p, %d, %d) from (%d, %d)", - SP_PARM, row, col, SP_PARM->_cursrow, SP_PARM->_curscol)); + (void *) SP_PARM, row, col, SP_PARM->_cursrow, SP_PARM->_curscol)); position_check(SP_PARM, SP_PARM->_cursrow, SP_PARM->_curscol, "GoTo"); @@ -628,7 +628,10 @@ PutRange(NCURSES_SP_DCLx int i, j, same; TR(TRACE_CHARPUT, ("PutRange(%p, %p, %p, %d, %d, %d)", - SP_PARM, otext, ntext, row, first, last)); + (void *) SP_PARM, + (const void *) otext, + (const void *) ntext, + row, first, last)); if (otext != ntext && (last - first + 1) > SP_PARM->_inline_cost) { @@ -670,7 +673,7 @@ TINFO_DOUPDATE(NCURSES_SP_DCL0) struct tms before, after; #endif /* USE_TRACE_TIMES */ - T((T_CALLED("_nc_tinfo:doupdate(%p)"), SP_PARM)); + T((T_CALLED("_nc_tinfo:doupdate(%p)"), (void *) SP_PARM)); #if !USE_REENTRANT /* @@ -1201,7 +1204,7 @@ ClrBottom(NCURSES_SP_DCLx int total) ** TransformLine(lineno) ** ** Transform the given line in curscr to the one in newscr, using -** Insert/Delete Character if _nc_idcok && has_ic(). +** Insert/Delete Character if idcok && has_ic(). ** ** firstChar = position of first different character in line ** oLastChar = position of last different character in old line @@ -1224,7 +1227,7 @@ TransformLine(NCURSES_SP_DCLx int const lineno) int n; bool attrchanged = FALSE; - TR(TRACE_UPDATE, (T_CALLED("TransformLine(%p, %d)"), SP_PARM, lineno)); + TR(TRACE_UPDATE, (T_CALLED("TransformLine(%p, %d)"), (void *) SP_PARM, lineno)); /* copy new hash value to old one */ if (SP_PARM->oldhash && SP_PARM->newhash) @@ -1623,7 +1626,9 @@ ClearScreen(NCURSES_SP_DCLx NCURSES_CH_T blank) static void InsStr(NCURSES_SP_DCLx NCURSES_CH_T * line, int count) { - TR(TRACE_UPDATE, ("InsStr(%p, %p,%d) called", SP_PARM, line, count)); + TR(TRACE_UPDATE, ("InsStr(%p, %p,%d) called", + (void *) SP_PARM, + (void *) line, count)); /* Prefer parm_ich as it has the smallest cost - no need to shift * the whole line on each character. */ @@ -1682,7 +1687,7 @@ DelChar(NCURSES_SP_DCLx int count) int n; TR(TRACE_UPDATE, ("DelChar(%p, %d) called, position = (%ld,%ld)", - SP_PARM, count, + (void *) SP_PARM, count, (long) NewScreen(SP_PARM)->_cury, (long) NewScreen(SP_PARM)->_curx)); @@ -1939,7 +1944,8 @@ NCURSES_SP_NAME(_nc_scrolln) (NCURSES_SP_DCLx bool cursor_saved = FALSE; int res; - TR(TRACE_MOVE, ("_nc_scrolln(%p, %d, %d, %d, %d)", SP_PARM, n, top, bot, maxy)); + TR(TRACE_MOVE, ("_nc_scrolln(%p, %d, %d, %d, %d)", + (void *) SP_PARM, n, top, bot, maxy)); if (!IsValidScreen(SP_PARM)) return (ERR);