ncurses 5.9 - patch 20121026

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

diff --git a/ncurses/base/lib_hline.c b/ncurses/base/lib_hline.c
index fd32d35a38e770ff662e6a33a9a9a54a78dcdbc0..1f0380830ddc7497dd36a5b8579d2150e990e0f0 100644 (file)
--- a/ncurses/base/lib_hline.c
+++ b/ncurses/base/lib_hline.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 1998,1999,2000 Free Software Foundation, Inc.              *
+ * Copyright (c) 1998-2009,2010 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,19 +40,20 @@
 
 #include <curses.priv.h>
 
-MODULE_ID("$Id: lib_hline.c,v 1.6 2000/07/04 14:08:09 Philippe.Blain Exp $")
+MODULE_ID("$Id: lib_hline.c,v 1.13 2010/12/19 01:48:39 tom Exp $")
 
-int
+NCURSES_EXPORT(int)
 whline(WINDOW *win, chtype ch, int n)
 {
     int code = ERR;
-    NCURSES_SIZE_T start;
-    NCURSES_SIZE_T end;
+    int start;
+    int 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;
 
        start = win->_curx;
        end = start + n - 1;
@@ -62,11 +63,13 @@ whline(WINDOW *win, chtype ch, int n)
        CHANGED_RANGE(line, start, end);
 
        if (ch == 0)
-           ch = ACS_HLINE;
-       ch = _nc_render(win, ch);
+           SetChar2(wch, ACS_HLINE);
+       else
+           SetChar2(wch, ch);
+       wch = _nc_render(win, wch);
 
        while (end >= start) {
-           line->text[end] = ch;
+           line->text[end] = wch;
            end--;
        }