X-Git-Url: https://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=ncurses%2Fbase%2Flib_redrawln.c;h=5696205125e0f0f7e7f67ac85881ae5b2ffb06d8;hp=b04a488ba554bdf8914fbc15140b54d6f70eebd0;hb=cb9a015f6669e86dd5db0fcdf1a6d74c7ea5df55;hpb=7a6bbc8cf41c5186d46accc3d08622dc86526b34

diff --git a/ncurses/base/lib_redrawln.c b/ncurses/base/lib_redrawln.c
index b04a488b..56962051 100644
--- a/ncurses/base/lib_redrawln.c
+++ b/ncurses/base/lib_redrawln.c
@@ -39,7 +39,7 @@
 
 #include <curses.priv.h>
 
-MODULE_ID("$Id: lib_redrawln.c,v 1.13 2009/04/18 18:46:00 tom Exp $")
+MODULE_ID("$Id: lib_redrawln.c,v 1.15 2009/11/07 16:00:54 tom Exp $")
 
 NCURSES_EXPORT(int)
 wredrawln(WINDOW *win, int beg, int num)
@@ -49,7 +49,7 @@ wredrawln(WINDOW *win, int beg, int num)
     size_t len;
     SCREEN *sp;
 
-    T((T_CALLED("wredrawln(%p,%d,%d)"), win, beg, num));
+    T((T_CALLED("wredrawln(%p,%d,%d)"), (void *) win, beg, num));
 
     if (win == 0)
 	returnCode(ERR);
@@ -62,24 +62,24 @@ wredrawln(WINDOW *win, int beg, int num)
     if (touchline(win, beg, num) == ERR)
 	returnCode(ERR);
 
-    if (touchline(sp->_curscr, beg + win->_begy, num) == ERR)
+    if (touchline(CurScreen(sp), beg + win->_begy, num) == ERR)
 	returnCode(ERR);
 
     end = beg + num;
-    if (end > sp->_curscr->_maxy + 1)
-	end = sp->_curscr->_maxy + 1;
+    if (end > CurScreen(sp)->_maxy + 1)
+	end = CurScreen(sp)->_maxy + 1;
     if (end > win->_maxy + 1)
 	end = win->_maxy + 1;
 
     len = (win->_maxx + 1);
-    if (len > (size_t) (sp->_curscr->_maxx + 1))
-	len = (size_t) (sp->_curscr->_maxx + 1);
-    len *= sizeof(sp->_curscr->_line[0].text[0]);
+    if (len > (size_t) (CurScreen(sp)->_maxx + 1))
+	len = (size_t) (CurScreen(sp)->_maxx + 1);
+    len *= sizeof(CurScreen(sp)->_line[0].text[0]);
 
     for (i = beg; i < end; i++) {
 	int crow = i + win->_begy;
 
-	memset(sp->_curscr->_line[crow].text + win->_begx, 0, len);
+	memset(CurScreen(sp)->_line[crow].text + win->_begx, 0, len);
 	NCURSES_SP_NAME(_nc_make_oldhash) (NCURSES_SP_ARGx crow);
     }