X-Git-Url: https://ncurses.scripts.mit.edu/?a=blobdiff_plain;f=ncurses%2Fbase%2Flib_clreol.c;h=d6cb9b26128386a03b7930e082ff13a008453437;hb=dafd158641767f37aa900c195aaa77b27da38500;hp=a5d067cbfd5ffbea3f69ca5b08950a00573699c8;hpb=b1f61d9f3aa244512045a6b02e759825d7049d34;p=ncurses.git

diff --git a/ncurses/base/lib_clreol.c b/ncurses/base/lib_clreol.c
index a5d067cb..d6cb9b26 100644
--- a/ncurses/base/lib_clreol.c
+++ b/ncurses/base/lib_clreol.c
@@ -1,5 +1,6 @@
 /****************************************************************************
- * Copyright (c) 1998,1999,2000 Free Software Foundation, Inc.              *
+ * Copyright 2020 Thomas E. Dickey                                          *
+ * Copyright 1998-2001,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            *
@@ -40,18 +41,18 @@
 
 #include <curses.priv.h>
 
-MODULE_ID("$Id: lib_clreol.c,v 1.16 2000/04/29 21:14:54 tom Exp $")
+MODULE_ID("$Id: lib_clreol.c,v 1.23 2020/02/02 23:34:34 tom Exp $")
 
-int
+NCURSES_EXPORT(int)
 wclrtoeol(WINDOW *win)
 {
     int code = ERR;
 
-    T((T_CALLED("wclrtoeol(%p)"), win));
+    T((T_CALLED("wclrtoeol(%p)"), (void *) win));
 
     if (win) {
-	chtype blank;
-	chtype *ptr, *end;
+	NCURSES_CH_T blank;
+	NCURSES_CH_T *ptr, *end;
 	struct ldat *line;
 	NCURSES_SIZE_T y = win->_cury;
 	NCURSES_SIZE_T x = win->_curx;
@@ -60,7 +61,7 @@ wclrtoeol(WINDOW *win)
 	 * 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
+	if ((win->_flags & _WRAPPED) != 0
 	    && y < win->_maxy) {
 	    win->_flags &= ~_WRAPPED;
 	}
@@ -69,12 +70,12 @@ wclrtoeol(WINDOW *win)
 	 * There's no point in clearing if we're not on a legal
 	 * position, either.
 	 */
-	if (win->_flags & _WRAPPED
+	if ((win->_flags & _WRAPPED) != 0
 	    || y > win->_maxy
 	    || x > win->_maxx)
 	    returnCode(ERR);
 
-	blank = _nc_background(win);
+	blank = win->_nc_bkgd;
 	line = &win->_line[y];
 	CHANGED_TO_EOL(line, x, win->_maxx);