about summary refs log tree commit diff
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--edit.c15
-rw-r--r--edit.h1
2 files changed, 7 insertions, 9 deletions
diff --git a/edit.c b/edit.c
index 5766b29..b0bdb23 100644
--- a/edit.c
+++ b/edit.c
@@ -44,7 +44,7 @@ void editFree(struct Edit *e) {
 	free(e->mbs.buf);
 	e->pos = e->len = e->cap = 0;
 	e->cut.len = 0;
-	e->mbs.pos = e->mbs.len = 0;
+	e->mbs.pos = 0;
 }
 
 char *editString(struct Edit *e) {
@@ -54,19 +54,18 @@ char *editString(struct Edit *e) {
 	e->mbs.buf = buf;
 
 	const wchar_t *ptr = e->buf;
-	e->mbs.len = wcsnrtombs(e->mbs.buf, &ptr, e->pos, cap-1, NULL);
-	if (e->mbs.len == (size_t)-1) return NULL;
-	e->mbs.pos = e->mbs.len;
+	size_t len = wcsnrtombs(e->mbs.buf, &ptr, e->pos, cap-1, NULL);
+	if (len == (size_t)-1) return NULL;
+	e->mbs.pos = len;
 
 	ptr = &e->buf[e->pos];
 	size_t n = wcsnrtombs(
-		&e->mbs.buf[e->mbs.len], &ptr, e->len - e->pos,
-		cap-1 - e->mbs.len, NULL
+		&e->mbs.buf[len], &ptr, e->len - e->pos, cap-1 - len, NULL
 	);
 	if (n == (size_t)-1) return NULL;
-	e->mbs.len += n;
+	len += n;
 
-	e->mbs.buf[e->mbs.len] = '\0';
+	e->mbs.buf[len] = '\0';
 	return e->mbs.buf;
 }
 
diff --git a/edit.h b/edit.h
index d15e5fb..49adb7f 100644
--- a/edit.h
+++ b/edit.h
@@ -45,7 +45,6 @@ struct Edit {
 	struct {
 		char *buf;
 		size_t pos;
-		size_t len;
 	} mbs;
 };
 
June McEnroe 2019-02-22Disable terminal flow controlJune McEnroe 2019-02-22Bind up and down arrows to scrollJune McEnroe 2019-02-22Remove topic TODOJune McEnroe 2019-02-22Add /znc commandJune McEnroe 2019-02-22Update status line after scrolling and term eventsJune McEnroe 2019-02-22Reorganize input.cJune McEnroe 2019-02-22Fix name of <raw> window in man pageJune McEnroe 2019-02-22Rename global tags with angle bracketsJune McEnroe 2019-02-22Show status window while connectingJune McEnroe 2019-02-22Reorganize UI code for the umpteenth timeJune McEnroe 2019-02-21Replace "view" with "window"June McEnroe 2019-02-21Remove ROT13June McEnroe 2019-02-21Clean up man pageJune McEnroe 2019-01-26Draw UI before connectingJune McEnroe 2019-01-25Avoid unused variable warnings with getyxJune McEnroe 2019-01-25Add GNU/Linux build instructionsJune McEnroe