ncurses 5.9 - patch 20120303

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

diff --git a/ncurses/base/lib_clrbot.c b/ncurses/base/lib_clrbot.c
index d1e243f37ffd6de5b855cf31e00fb76f410019cf..cbf2206d558156d69946d60dc01ce229081b49a6 100644 (file)
--- a/ncurses/base/lib_clrbot.c
+++ b/ncurses/base/lib_clrbot.c
@@ -1,5 +1,5 @@
 /****************************************************************************
 /****************************************************************************

- * Copyright (c) 1998,1999,2000 Free Software Foundation, Inc.              *
+ * Copyright (c) 1998-2006,2009 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            *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
  * copy of this software and associated documentation files (the            *


@@ -40,27 +40,27 @@
 
 #include <curses.priv.h>
 
 
 #include <curses.priv.h>
 

-MODULE_ID("$Id: lib_clrbot.c,v 1.15 2000/04/29 21:15:26 tom Exp $")
+MODULE_ID("$Id: lib_clrbot.c,v 1.21 2009/10/24 22:33:19 tom Exp $")

 
 

-int
+NCURSES_EXPORT(int)

 wclrtobot(WINDOW *win)
 {
     int code = ERR;
 
 wclrtobot(WINDOW *win)
 {
     int code = ERR;
 

-    T((T_CALLED("wclrtobot(%p)"), win));
+    T((T_CALLED("wclrtobot(%p)"), (void *) win));

 
     if (win) {
        NCURSES_SIZE_T y;
        NCURSES_SIZE_T startx = win->_curx;
 
     if (win) {
        NCURSES_SIZE_T y;
        NCURSES_SIZE_T startx = win->_curx;

-       chtype blank = _nc_background(win);
+       NCURSES_CH_T blank = win->_nc_bkgd;

 
 

-       T(("clearing from y = %d to y = %d with maxx =  %d",
-               win->_cury, win->_maxy, win->_maxx));
+       T(("clearing from y = %ld to y = %ld with maxx =  %ld",
+          (long) win->_cury, (long) win->_maxy, (long) win->_maxx));

 
        for (y = win->_cury; y <= win->_maxy; y++) {
            struct ldat *line = &(win->_line[y]);
 
        for (y = win->_cury; y <= win->_maxy; y++) {
            struct ldat *line = &(win->_line[y]);

-           chtype *ptr = &(line->text[startx]);
-           chtype *end = &(line->text[win->_maxx]);
+           NCURSES_CH_T *ptr = &(line->text[startx]);
+           NCURSES_CH_T *end = &(line->text[win->_maxx]);

 
            CHANGED_TO_EOL(line, startx, win->_maxx);
 
 
            CHANGED_TO_EOL(line, startx, win->_maxx);