ncurses 6.0 - patch 20160528

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

diff --git a/ncurses/base/lib_hline.c b/ncurses/base/lib_hline.c
index 2cb6cc5ce6fd53fbf97f53168a28033cc9f74604..32f0b477e0be96f8fe17b79b268906951727b6a7 100644 (file)
--- a/ncurses/base/lib_hline.c
+++ b/ncurses/base/lib_hline.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 1998,1999,2000,2001 Free Software Foundation, Inc.         *
+ * Copyright (c) 1998-2010,2016 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,32 +40,30 @@
 
 #include <curses.priv.h>
 
-MODULE_ID("$Id: lib_hline.c,v 1.10 2001/06/03 00:39:24 skimo Exp $")
+MODULE_ID("$Id: lib_hline.c,v 1.14 2016/05/28 23:11:26 tom Exp $")
 
 NCURSES_EXPORT(int)
 whline(WINDOW *win, chtype ch, int n)
 {
     int code = ERR;
-    NCURSES_SIZE_T start;
-    NCURSES_SIZE_T end;
 
-    T((T_CALLED("whline(%p,%s,%d)"), win, _tracechtype(ch), n));
+    T((T_CALLED("whline(%p,%s,%d)"), (void *) win, _tracechtype(ch), n));
 
     if (win) {
        struct ldat *line = &(win->_line[win->_cury]);
        NCURSES_CH_T wch;
+       int start = win->_curx;
+       int end = start + n - 1;
 
-       start = win->_curx;
-       end = start + n - 1;
        if (end > win->_maxx)
            end = win->_maxx;
 
        CHANGED_RANGE(line, start, end);
 
        if (ch == 0)
-           SetChar(wch, ChCharOf(ACS_HLINE), ChAttrOf(ACS_HLINE));
+           SetChar2(wch, ACS_HLINE);
        else
-           SetChar(wch, ChCharOf(ch), ChAttrOf(ch));
+           SetChar2(wch, ch);
        wch = _nc_render(win, wch);
 
        while (end >= start) {