ncurses 5.3

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

diff --git a/ncurses/base/lib_redrawln.c b/ncurses/base/lib_redrawln.c
index 10fda917984e38c520c101a55c82194953a5130b..91a03711de7cc701928a46257a7aa4d63b21afd7 100644 (file)
--- a/ncurses/base/lib_redrawln.c
+++ b/ncurses/base/lib_redrawln.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 1998 Free Software Foundation, Inc.                        *
+ * Copyright (c) 1998,2000,2001 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,31 +39,37 @@
 
 #include <curses.priv.h>
 
-MODULE_ID("$Id: lib_redrawln.c,v 1.7 1998/09/19 20:09:50 Alexander.V.Lukyanov Exp $")
+MODULE_ID("$Id: lib_redrawln.c,v 1.10 2001/09/29 17:41:31 tom Exp $")
 
-int wredrawln(WINDOW *win, int beg, int num)
+NCURSES_EXPORT(int)
+wredrawln(WINDOW *win, int beg, int num)
 {
-       int i;
-       int end;
-       size_t len = (win->_maxx + 1) * sizeof(chtype);
+    int i;
+    int end;
+    size_t len = (win->_maxx + 1);
 
-       T((T_CALLED("wredrawln(%p,%d,%d)"), win, beg, num));
+    T((T_CALLED("wredrawln(%p,%d,%d)"), win, beg, num));
 
-       if (beg < 0)
-               beg = 0;
+    if (beg < 0)
+       beg = 0;
 
-       if (touchline (win, beg, num) == ERR)
-               returnCode(ERR);
+    if (touchline(win, beg, num) == ERR)
+       returnCode(ERR);
 
-       end = beg + num;
-       if (end > win->_maxy + 1)
-               end = win->_maxy + 1;
+    end = beg + num;
+    if (end > curscr->_maxy + 1)
+       end = curscr->_maxy + 1;
+    if (end > win->_maxy + 1)
+       end = win->_maxy + 1;
 
-       for (i = beg; i < end; i++)
-       {
-               memset (curscr->_line[i+win->_begy].text+win->_begx, 0, len);
-               _nc_make_oldhash(i+win->_begy);
-       }
+    if (len > (size_t) (curscr->_maxx + 1))
+       len = (size_t) (curscr->_maxx + 1);
+    len *= sizeof(curscr->_line[0].text[0]);
 
-       returnCode(OK);
+    for (i = beg; i < end; i++) {
+       memset(curscr->_line[i + win->_begy].text + win->_begx, 0, len);
+       _nc_make_oldhash(i + win->_begy);
+    }
+
+    returnCode(OK);
 }