aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornoname@inventati.org <noname@inventati.org>2015-04-21 23:28:40 +0200
committerRoberto E. Vargas Caballero <k0ga@shike2.com>2015-04-27 08:59:45 +0200
commit753fe862b14c7dd4b0449ab2c3bf22ecbb10030e (patch)
tree7c3b62bcdb594732fc1e66988896a86da9324682
parent61c35cd24625c6d14b4a2de8bd639da52aa513bd (diff)
downloadst-753fe862b14c7dd4b0449ab2c3bf22ecbb10030e.tar.gz
Remove last parameter of utf8encode
This parameter was always UTF_SIZ, so it is better remove it and use directly UTF_SIZ in it.
-rw-r--r--st.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/st.c b/st.c
index 6371a85..8ca310c 100644
--- a/st.c
+++ b/st.c
@@ -459,7 +459,7 @@ static void mousereport(XEvent *);
static size_t utf8decode(char *, long *, size_t);
static long utf8decodebyte(char, size_t *);
-static size_t utf8encode(long, char *, size_t);
+static size_t utf8encode(long, char *);
static char utf8encodebyte(long, size_t);
static size_t utf8len(char *);
static size_t utf8validate(long *, size_t);
@@ -610,11 +610,11 @@ utf8decodebyte(char c, size_t *i) {
}
size_t
-utf8encode(long u, char *c, size_t clen) {
+utf8encode(long u, char *c) {
size_t len, i;
len = utf8validate(&u, 0);
- if(clen < len)
+ if(len > UTF_SIZ)
return 0;
for(i = len - 1; i != 0; --i) {
c[i] = utf8encodebyte(u, 0);
@@ -1351,7 +1351,7 @@ ttyread(void) {
buflen += ret;
ptr = buf;
while((charsize = utf8decode(ptr, &unicodep, buflen))) {
- utf8encode(unicodep, s, UTF_SIZ);
+ utf8encode(unicodep, s);
tputc(s, charsize);
ptr += charsize;
buflen -= charsize;
@@ -3848,7 +3848,7 @@ kpress(XEvent *ev) {
if(IS_SET(MODE_8BIT)) {
if(*buf < 0177) {
c = *buf | 0x80;
- len = utf8encode(c, buf, UTF_SIZ);
+ len = utf8encode(c, buf);
}
} else {
buf[1] = buf[0];