ncurses 6.1 - patch 20190511

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

diff --git a/ncurses/base/lib_redrawln.c b/ncurses/base/lib_redrawln.c
index b04a488ba554bdf8914fbc15140b54d6f70eebd0..72905f84d656c6580c431641df2858a76eb568ce 100644 (file)
--- a/ncurses/base/lib_redrawln.c
+++ b/ncurses/base/lib_redrawln.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 1998-2007,2009 Free Software Foundation, Inc.              *
+ * Copyright (c) 1998-2009,2010 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            *
@@ -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.17 2010/12/19 00:03:23 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 - win->_begy)
+       end = CurScreen(sp)->_maxy + 1 - win->_begy;
     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]);
+    len = (size_t) (win->_maxx + 1);
+    if (len > (size_t) (CurScreen(sp)->_maxx + 1 - win->_begx))
+       len = (size_t) (CurScreen(sp)->_maxx + 1 - win->_begx);
+    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);
     }