ncurses 5.6 - patch 20070602

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

diff --git a/ncurses/base/lib_clreol.c b/ncurses/base/lib_clreol.c
index 0c7522278e382aa440ca65e8ec9d25d34cba1bc2..c46ebd93a33232729ad735f31d2d7d3609d85335 100644 (file)
--- a/ncurses/base/lib_clreol.c
+++ b/ncurses/base/lib_clreol.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 1998 Free Software Foundation, Inc.                        *
+ * Copyright (c) 1998,1999,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            *
@@ -31,7 +31,6 @@
  *     and: Eric S. Raymond <esr@snark.thyrsus.com>                         *
  ****************************************************************************/
 
-
 /*
 **     lib_clreol.c
 **
@@ -41,51 +40,52 @@
 
 #include <curses.priv.h>
 
-MODULE_ID("$Id: lib_clreol.c,v 1.15 1998/06/28 00:32:20 tom Exp $")
+MODULE_ID("$Id: lib_clreol.c,v 1.21 2001/12/19 01:06:04 tom Exp $")
 
-int  wclrtoeol(WINDOW *win)
+NCURSES_EXPORT(int)
+wclrtoeol(WINDOW *win)
 {
-int     code = ERR;
+    int code = ERR;
 
-       T((T_CALLED("wclrtoeol(%p)"), win));
+    T((T_CALLED("wclrtoeol(%p)"), win));
 
-       if (win) {
-               chtype  blank;
-               chtype  *ptr, *end;
-               struct ldat *line;
-               short y = win->_cury;
-               short x = win->_curx;
+    if (win) {
+       NCURSES_CH_T blank;
+       NCURSES_CH_T *ptr, *end;
+       struct ldat *line;
+       NCURSES_SIZE_T y = win->_cury;
+       NCURSES_SIZE_T x = win->_curx;
 
-               /*
-                * If we have just wrapped the cursor, the clear applies to the
-                * new line, unless we are at the lower right corner.
-                */
-               if (win->_flags & _WRAPPED
-                && y < win->_maxy) {
-                       win->_flags &= ~_WRAPPED;
-               }
+       /*
+        * If we have just wrapped the cursor, the clear applies to the
+        * new line, unless we are at the lower right corner.
+        */
+       if ((win->_flags & _WRAPPED) != 0
+           && y < win->_maxy) {
+           win->_flags &= ~_WRAPPED;
+       }
 
-               /*
-                * There's no point in clearing if we're not on a legal
-                * position, either.
-                */
-               if (win->_flags & _WRAPPED
-                || y > win->_maxy
-                || x > win->_maxx)
-                       returnCode(ERR);
+       /*
+        * There's no point in clearing if we're not on a legal
+        * position, either.
+        */
+       if ((win->_flags & _WRAPPED) != 0
+           || y > win->_maxy
+           || x > win->_maxx)
+           returnCode(ERR);
 
-               blank = _nc_background(win);
-               line = &win->_line[y];
-               CHANGED_TO_EOL(line, x, win->_maxx);
+       blank = win->_nc_bkgd;
+       line = &win->_line[y];
+       CHANGED_TO_EOL(line, x, win->_maxx);
 
-               ptr = &(line->text[x]);
-               end = &(line->text[win->_maxx]);
+       ptr = &(line->text[x]);
+       end = &(line->text[win->_maxx]);
 
-               while (ptr <= end)
-                       *ptr++ = blank;
+       while (ptr <= end)
+           *ptr++ = blank;
 
-               _nc_synchook(win);
-               code = OK;
-       }
-       returnCode(code);
+       _nc_synchook(win);
+       code = OK;
+    }
+    returnCode(code);
 }