From f1002cdc6d70bae0c5f68df1d91cd170189d4789 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc=20Andr=C3=A9=20Tanner?= Date: Sat, 7 Nov 2015 08:45:15 +0100 Subject: vis: introduce vis_cancel API --- vis.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'vis.c') diff --git a/vis.c b/vis.c index 07bcd3c..82532b6 100644 --- a/vis.c +++ b/vis.c @@ -660,11 +660,15 @@ static void action_do(Vis *vis, Action *a) { a->macro = vis->macro_operator; vis->action_prev = *a; } - action_reset(vis, a); + action_reset(a); } } -void action_reset(Vis *vis, Action *a) { +void vis_cancel(Vis *vis) { + action_reset(&vis->action); +} + +void action_reset(Action *a) { memset(a, 0, sizeof(*a)); } @@ -1034,7 +1038,7 @@ bool vis_motion(Vis *vis, enum VisMotion motion, ...) { { const char *pattern = va_arg(ap, char*); if (text_regex_compile(vis->search_pattern, pattern, REG_EXTENDED)) { - action_reset(vis, &vis->action); + vis_cancel(vis); goto err; } if (motion == MOVE_SEARCH_FORWARD) @@ -1199,7 +1203,7 @@ void vis_repeat(Vis *vis) { } vis->action_prev = action_prev; } - action_reset(vis, &vis->action); + vis_cancel(vis); } void vis_mark_set(Vis *vis, enum VisMark mark, size_t pos) { -- cgit v1.2.3