vis

commit 8a95fd4be70c08db662c4b22ecfde83601128292
parent f01d18af50fa892189e1314c9056d1408d379815
Author: Marc André Tanner <mat@brain-dump.org>
Date:   Tue, 15 Mar 2016 19:29:22 +0100

vis: slightly cleanup register related code

Diffstat:
M
register.c
 | 
4
++++
M
register.h
 | 
11
++++++-----
M
vis-prompt.c
 | 
2
+-
M
vis.c
 | 
2
+-

4 files changed, 12 insertions(+), 7 deletions(-)
diff --git 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(&reg->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
@@ -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
@@ -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
@@ -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;
 }