From b24f677d6ee23801e7377765aaed32327912d3e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc=20Andr=C3=A9=20Tanner?= Date: Tue, 15 Mar 2016 19:29:22 +0100 Subject: vis: slightly cleanup register related code --- register.c | 4 ++++ register.h | 11 ++++++----- vis-prompt.c | 2 +- vis.c | 2 +- 4 files changed, 12 insertions(+), 7 deletions(-) diff --git a/register.c b/register.c index 57268e8..db87275 100644 --- a/register.c +++ b/register.c @@ -65,6 +65,10 @@ bool register_put(Vis *vis, Register *reg, const char *data, size_t len) { return reg->type == REGISTER_NORMAL && buffer_put(®->buf, data, len); } +bool register_put0(Vis *vis, Register *reg, const char *data) { + return register_put(vis, reg, data, strlen(data)+1); +} + bool register_put_range(Vis *vis, Register *reg, Text *txt, Filerange *range) { if (reg->append) return register_append_range(reg, txt, range); diff --git a/register.h b/register.h index d66e557..0e7b925 100644 --- a/register.h +++ b/register.h @@ -21,10 +21,11 @@ typedef struct { } type; } Register; -void register_release(Register *reg); -const char *register_get(Vis*, Register*reg, size_t *len); -bool register_put(Vis*, Register *reg, const char *data, size_t len); -bool register_put_range(Vis*, Register *reg, Text *txt, Filerange *range); -bool register_append_range(Register *reg, Text *txt, Filerange *range); +void register_release(Register*); +const char *register_get(Vis*, Register*, size_t *len); +bool register_put(Vis*, Register*, const char *data, size_t len); +bool register_put0(Vis*, Register*, const char *data); +bool register_put_range(Vis*, Register*, Text*, Filerange*); +bool register_append_range(Register*, Text*, Filerange*); #endif diff --git a/vis-prompt.c b/vis-prompt.c index faa145d..71d2c51 100644 --- a/vis-prompt.c +++ b/vis-prompt.c @@ -14,7 +14,7 @@ bool vis_prompt_cmd(Vis *vis, const char *cmd) { case '+': case ':': { - register_put(vis, &vis->registers[VIS_REG_COMMAND], cmd+1, strlen(cmd+1)+1); + register_put0(vis, &vis->registers[VIS_REG_COMMAND], cmd+1); bool ret = vis_cmd(vis, cmd+1); if (ret && vis->mode->visual) vis_mode_switch(vis, VIS_MODE_NORMAL); diff --git a/vis.c b/vis.c index 7794e89..cfdc210 100644 --- a/vis.c +++ b/vis.c @@ -1119,7 +1119,7 @@ Regex *vis_regex(Vis *vis, const char *pattern) { text_regex_free(regex); return NULL; } - register_put(vis, &vis->registers[VIS_REG_SEARCH], pattern, strlen(pattern)+1); + register_put0(vis, &vis->registers[VIS_REG_SEARCH], pattern); return regex; } -- cgit v1.2.3