X-Git-Url: https://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=ncurses%2Fbase%2Flib_clreol.c;h=7aff84b35a426884acdc6f4cc510e82afe745546;hp=0c7522278e382aa440ca65e8ec9d25d34cba1bc2;hb=79695a2ff354087dca5006351286f741ee8c82c4;hpb=0eb88fc5281804773e2a0c7a488a4452463535ce

diff --git a/ncurses/base/lib_clreol.c b/ncurses/base/lib_clreol.c
index 0c752227..7aff84b3 100644
--- 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-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            *
@@ -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.22 2009/10/24 22:33:06 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)"), (void *) 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);
 }