diff options
| author | Ingo Schwarze <schwarze@cvs.openbsd.org> | 2016-05-22 23:16:01 +0000 |
|---|---|---|
| committer | Ingo Schwarze <schwarze@cvs.openbsd.org> | 2016-05-22 23:16:01 +0000 |
| commit | 63ea93a53d005752de0afe6ff32706d4ad6b8084 (patch) | |
| tree | c37dac5892253786cdc5c081c712ad377a21b141 | |
| parent | ef8b1b00aed61bc6a471a607fb8bc029f404b1ce (diff) | |
cope with simplified chared/read interface
| -rw-r--r-- | regress/lib/libedit/read/glue.c | 2 | ||||
| -rw-r--r-- | regress/lib/libedit/read/test_getcmd.c | 9 |
2 files changed, 3 insertions, 8 deletions
diff --git a/regress/lib/libedit/read/glue.c b/regress/lib/libedit/read/glue.c index 3252604a647..7364a4f20d9 100644 --- a/regress/lib/libedit/read/glue.c +++ b/regress/lib/libedit/read/glue.c @@ -24,7 +24,7 @@ #define UU __attribute__((__unused__)) int ch_enlargebufs(EL, size_t addlen UU) { return 1; } -void ch_reset(EL, int mclear UU) { } +void ch_reset(EL) { } void el_resize(EL) { } int el_set(EL, int op UU, ...) { return 0; } int el_wset(EL, int op UU, ...) { return 0; } diff --git a/regress/lib/libedit/read/test_getcmd.c b/regress/lib/libedit/read/test_getcmd.c index 0d0e58b8004..676e74452ab 100644 --- a/regress/lib/libedit/read/test_getcmd.c +++ b/regress/lib/libedit/read/test_getcmd.c @@ -34,7 +34,7 @@ int main() { EditLine el; - c_macro_t *ma; + struct macros *ma; int irc; wchar_t ch; el_action_t cmdnum; @@ -57,14 +57,9 @@ main() if ((el.el_signal = calloc(1, sizeof(*el.el_signal))) == NULL) err(1, NULL); - ma = &el.el_chared.c_macro; - ma->level = -1; - ma->offset = 0; - if ((ma->macro = calloc(EL_MAXMACRO, sizeof(*ma->macro))) == NULL) - err(1, NULL); - if (read_init(&el) != 0) err(1, "read_init"); + ma = &el.el_read->macros; do { irc = read_getcmd(&el, &cmdnum, &ch); |