diff options
| author |   schwarze <schwarze@openbsd.org> | 2016-01-30 00:06:39 +0000 |
|---|---|---|
| committer | schwarze <schwarze@openbsd.org> | 2016-01-30 00:06:39 +0000 |
| commit | fd40972a32cae034e619460a2b6f83c3492db0ca (patch) | |
| tree | 72798d3d835644ba0a1c63eade7f249cf5f8e482 /lib/libedit/common.c | |
| parent | whitespace fixes; ok ajacoutot (diff) | |
| download | wireguard-openbsd-fd40972a32cae034e619460a2b6f83c3492db0ca.tar.xz wireguard-openbsd-fd40972a32cae034e619460a2b6f83c3492db0ca.zip | |
Third step in synching with NetBSD:
* rename fkey_t to funckey_t and el_term_t to el_terminal_t
* rename struct editline member el_term to el_terminal
* rename many functions in terminal.c from term_*() to terminal_*(),
for consistency with the file name and to not look related to <term.h>
No functional change.
This makes refresh.c and sig.c almost identical to the NetBSD versions.
It reduces the remaining diff from +2446 -1805 to +2053 -1420.
OK czarkoff@
Diffstat (limited to 'lib/libedit/common.c')
| -rw-r--r-- | lib/libedit/common.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/lib/libedit/common.c b/lib/libedit/common.c index 185f949611c..10661a51b51 100644 --- a/lib/libedit/common.c +++ b/lib/libedit/common.c @@ -1,4 +1,4 @@ -/* $OpenBSD: common.c,v 1.8 2010/06/30 00:05:35 nicm Exp $ */ +/* $OpenBSD: common.c,v 1.9 2016/01/30 00:06:39 schwarze Exp $ */ /* $NetBSD: common.c,v 1.24 2009/12/30 22:37:40 christos Exp $ */ /*- @@ -149,7 +149,7 @@ ed_delete_next_char(EditLine *el, Int c) return (CC_ERROR); #else /* then do an EOF */ - term_writec(el, c); + terminal_writec(el, c); return (CC_EOF); #endif } else { @@ -580,7 +580,7 @@ protected el_action_t ed_clear_screen(EditLine *el, Int c __attribute__((__unused__))) { - term_clear_screen(el); /* clear the whole real screen */ + terminal_clear_screen(el); /* clear the whole real screen */ re_clear_display(el); /* reset everything */ return (CC_REFRESH); } @@ -904,10 +904,10 @@ ed_command(EditLine *el, Int c __attribute__((__unused__))) int tmplen; tmplen = c_gets(el, tmpbuf, STR("\n: ")); - term__putc(el, '\n'); + terminal__putc(el, '\n'); if (tmplen < 0 || (tmpbuf[tmplen] = 0, parse_line(el, tmpbuf)) == -1) - term_beep(el); + terminal_beep(el); el->el_map.current = el->el_map.key; re_clear_display(el); |