about summary refs log tree commit diff
diff options
context:
space:
mode:
authorJune McEnroe <june@causal.agency>2020-11-08 15:49:49 -0500
committerJune McEnroe <june@causal.agency>2020-11-08 16:21:34 -0500
commita1dece3df9ccc7676fe7a669de802a5ce4d05cc0 (patch)
tree75cd029f3c6de58edd4bdef3345bb15f39945c8a
parentRemove static buffer from colorMentions (diff)
downloadcatgirl-a1dece3df9ccc7676fe7a669de802a5ce4d05cc0.tar.gz
catgirl-a1dece3df9ccc7676fe7a669de802a5ce4d05cc0.zip
Use wmemcpy/wmemmove
Diffstat (limited to '')
-rw-r--r--edit.c12
1 files changed, 5 insertions, 7 deletions
diff --git a/edit.c b/edit.c
index 34b89fe..d9b7673 100644
--- a/edit.c
+++ b/edit.c
@@ -66,7 +66,7 @@ static struct {
 
 static bool reserve(size_t index, size_t count) {
 	if (len + count > Cap) return false;
-	memmove(&buf[index + count], &buf[index], sizeof(*buf) * (len - index));
+	wmemmove(&buf[index + count], &buf[index], len - index);
 	len += count;
 	return true;
 }
@@ -74,12 +74,10 @@ static bool reserve(size_t index, size_t count) {
 static void delete(bool copy, size_t index, size_t count) {
 	if (index + count > len) return;
 	if (copy) {
-		memcpy(cut.buf, &buf[index], sizeof(*buf) * count);
+		wmemcpy(cut.buf, &buf[index], count);
 		cut.len = count;
 	}
-	memmove(
-		&buf[index], &buf[index + count], sizeof(*buf) * (len - index - count)
-	);
+	wmemmove(&buf[index], &buf[index + count], len - index - count);
 	len -= count;
 }
 
@@ -185,7 +183,7 @@ static void tabComplete(uint id) {
 		reserve(tab.pos, tab.len);
 		buf[tab.pos + n] = L' ';
 	}
-	memcpy(&buf[tab.pos], wcs, sizeof(*wcs) * n);
+	wmemcpy(&buf[tab.pos], wcs, n);
 	pos = tab.pos + tab.len;
 }
 
@@ -234,7 +232,7 @@ void edit(uint id, enum Edit op, wchar_t ch) {
 		}
 		break; case EditPaste: {
 			if (reserve(pos, cut.len)) {
-				memcpy(&buf[pos], cut.buf, sizeof(*buf) * cut.len);
+				wmemcpy(&buf[pos], cut.buf, cut.len);
 				pos += cut.len;
 			}
 		}
s.txt?id=8da82224ab3ddf4db9165a276f2ff0017bf1c6da&follow=1'>Add AuthorityJune McEnroe 2019-05-19Specify precedence of unary versions of operatorsJune McEnroe 2019-05-18Add compound assignment operators to orderJune McEnroe 2019-05-15Support simple assignment in orderJune McEnroe 2019-05-15Implement sizeof in orderJune McEnroe 2019-05-15Add orderJune McEnroe 2019-05-12Add T suffix in bitJune McEnroe 2019-05-10Highlight yacc and lex files as CJune McEnroe 2019-05-10Use val instead of suboptargJune McEnroe 2019-05-09Add Parable of the SowerJune McEnroe 2019-05-07Add bit without buildJune McEnroe 2019-05-04Fix MANDIR typoJune McEnroe 2019-05-04Move relay to binJune McEnroea1c037038dc7e0af8611265698f5c&follow=1'>Import /usr/src/lib/libedit from NetBSD 8.0June McEnroe 2019-01-11Add PSlit for prompt escapesJune McEnroe 2019-01-11Don't make depend automaticallyJune McEnroe