ncurses 6.0 - patch 20160528

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

diff --git a/ncurses/base/lib_vline.c b/ncurses/base/lib_vline.c
index e48b864f497da09fafdaf9e5c2274ec10053e2e7..bb06e1b94c70cb8a9500e809446aaec6e7029e29 100644 (file)
--- a/ncurses/base/lib_vline.c
+++ b/ncurses/base/lib_vline.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 1998,1999,2000 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,31 +40,33 @@
 
 #include <curses.priv.h>
 
-MODULE_ID("$Id: lib_vline.c,v 1.5 2000/04/29 21:14:11 tom Exp $")
+MODULE_ID("$Id: lib_vline.c,v 1.13 2016/05/28 23:11:26 tom Exp $")
 
-int
+NCURSES_EXPORT(int)
 wvline(WINDOW *win, chtype ch, int n)
 {
     int code = ERR;
-    NCURSES_SIZE_T row, col;
-    NCURSES_SIZE_T end;
 
-    T((T_CALLED("wvline(%p,%s,%d)"), win, _tracechtype(ch), n));
+    T((T_CALLED("wvline(%p,%s,%d)"), (void *) win, _tracechtype(ch), n));
 
     if (win) {
-       row = win->_cury;
-       col = win->_curx;
-       end = row + n - 1;
+       NCURSES_CH_T wch;
+       int row = win->_cury;
+       int col = win->_curx;
+       int end = row + n - 1;
+
        if (end > win->_maxy)
            end = win->_maxy;
 
        if (ch == 0)
-           ch = ACS_VLINE;
-       ch = _nc_render(win, ch);
+           SetChar2(wch, ACS_VLINE);
+       else
+           SetChar2(wch, ch);
+       wch = _nc_render(win, wch);
 
        while (end >= row) {
            struct ldat *line = &(win->_line[end]);
-           line->text[col] = ch;
+           line->text[col] = wch;
            CHANGED_CELL(line, col);
            end--;
        }