diff options
| author | Ingo Schwarze <schwarze@cvs.openbsd.org> | 2016-05-25 09:28:14 +0000 |
|---|---|---|
| committer | Ingo Schwarze <schwarze@cvs.openbsd.org> | 2016-05-25 09:28:14 +0000 |
| commit | 0c2ab6ddf9dc62282240b2e009c08a56ca02fa48 (patch) | |
| tree | 5e6c6ede6904a27065e908b0983a3c6b5da234ab | |
| parent | 73c310e840366f437d3fcb845e4d79329dae8350 (diff) | |
deal with the el_errno -> read_errno cleanup, read.c rev. 1.43
| -rw-r--r-- | regress/lib/libedit/keymacro/test_get.c | 6 | ||||
| -rw-r--r-- | regress/lib/libedit/read/test_getcmd.c | 6 |
2 files changed, 5 insertions, 7 deletions
diff --git a/regress/lib/libedit/keymacro/test_get.c b/regress/lib/libedit/keymacro/test_get.c index 41b6824dd14..f54393410ce 100644 --- a/regress/lib/libedit/keymacro/test_get.c +++ b/regress/lib/libedit/keymacro/test_get.c @@ -113,9 +113,7 @@ main() if (el_wgetc(&el, &ch) == 0) errx(1, "el_wgetc i"); irc = keymacro_get(&el, &ch, &val); - if (irc != XK_CMD) - errx(1, "eof %d != XK_CMD", irc); - if (val.cmd != ED_END_OF_FILE) - errx(1, "ad %u != ED_END_OF_FILE", val.cmd); + if (irc != XK_NOD) + errx(1, "eof %d != XK_NOD", irc); return 0; } diff --git a/regress/lib/libedit/read/test_getcmd.c b/regress/lib/libedit/read/test_getcmd.c index 676e74452ab..1cc47fc194c 100644 --- a/regress/lib/libedit/read/test_getcmd.c +++ b/regress/lib/libedit/read/test_getcmd.c @@ -42,7 +42,7 @@ main() if (setlocale(LC_CTYPE, "") == NULL) err(1, "setlocale"); - el.el_errno = ENOMSG; + el.el_read->read_errno = ENOMSG; el.el_flags = CHARSET_IS_UTF8; el.el_infd = STDIN_FILENO; el.el_state.metanext = 0; @@ -86,8 +86,8 @@ main() printf("ret(%d)", irc); break; } - if (el.el_errno != 0) - printf(" el_errno=%d", el.el_errno); + if (el.el_read->read_errno != 0) + printf(" read_errno=%d", el.el_read->read_errno); if (ma->level > -1) printf(" macro[%d]=%ls(%d)", ma->level, *ma->macro, ma->offset); |