diff options
author | noname@inventati.org <noname@inventati.org> | 2015-04-21 23:28:40 +0200 |
---|---|---|
committer | Roberto E. Vargas Caballero <k0ga@shike2.com> | 2015-04-27 08:59:45 +0200 |
commit | 753fe862b14c7dd4b0449ab2c3bf22ecbb10030e (patch) | |
tree | 7c3b62bcdb594732fc1e66988896a86da9324682 /st.c | |
parent | 61c35cd24625c6d14b4a2de8bd639da52aa513bd (diff) | |
download | st-753fe862b14c7dd4b0449ab2c3bf22ecbb10030e.tar.gz st-753fe862b14c7dd4b0449ab2c3bf22ecbb10030e.zip |
Remove last parameter of utf8encode
This parameter was always UTF_SIZ, so it is better remove it and
use directly UTF_SIZ in it.
Diffstat (limited to 'st.c')
-rw-r--r-- | st.c | 10 |
1 files changed, 5 insertions, 5 deletions
@@ -459,7 +459,7 @@ static void mousereport(XEvent *); | |||
459 | 459 | ||
460 | static size_t utf8decode(char *, long *, size_t); | 460 | static size_t utf8decode(char *, long *, size_t); |
461 | static long utf8decodebyte(char, size_t *); | 461 | static long utf8decodebyte(char, size_t *); |
462 | static size_t utf8encode(long, char *, size_t); | 462 | static size_t utf8encode(long, char *); |
463 | static char utf8encodebyte(long, size_t); | 463 | static char utf8encodebyte(long, size_t); |
464 | static size_t utf8len(char *); | 464 | static size_t utf8len(char *); |
465 | static size_t utf8validate(long *, size_t); | 465 | static size_t utf8validate(long *, size_t); |
@@ -610,11 +610,11 @@ utf8decodebyte(char c, size_t *i) { | |||
610 | } | 610 | } |
611 | 611 | ||
612 | size_t | 612 | size_t |
613 | utf8encode(long u, char *c, size_t clen) { | 613 | utf8encode(long u, char *c) { |
614 | size_t len, i; | 614 | size_t len, i; |
615 | 615 | ||
616 | len = utf8validate(&u, 0); | 616 | len = utf8validate(&u, 0); |
617 | if(clen < len) | 617 | if(len > UTF_SIZ) |
618 | return 0; | 618 | return 0; |
619 | for(i = len - 1; i != 0; --i) { | 619 | for(i = len - 1; i != 0; --i) { |
620 | c[i] = utf8encodebyte(u, 0); | 620 | c[i] = utf8encodebyte(u, 0); |
@@ -1351,7 +1351,7 @@ ttyread(void) { | |||
1351 | buflen += ret; | 1351 | buflen += ret; |
1352 | ptr = buf; | 1352 | ptr = buf; |
1353 | while((charsize = utf8decode(ptr, &unicodep, buflen))) { | 1353 | while((charsize = utf8decode(ptr, &unicodep, buflen))) { |
1354 | utf8encode(unicodep, s, UTF_SIZ); | 1354 | utf8encode(unicodep, s); |
1355 | tputc(s, charsize); | 1355 | tputc(s, charsize); |
1356 | ptr += charsize; | 1356 | ptr += charsize; |
1357 | buflen -= charsize; | 1357 | buflen -= charsize; |
@@ -3848,7 +3848,7 @@ kpress(XEvent *ev) { | |||
3848 | if(IS_SET(MODE_8BIT)) { | 3848 | if(IS_SET(MODE_8BIT)) { |
3849 | if(*buf < 0177) { | 3849 | if(*buf < 0177) { |
3850 | c = *buf | 0x80; | 3850 | c = *buf | 0x80; |
3851 | len = utf8encode(c, buf, UTF_SIZ); | 3851 | len = utf8encode(c, buf); |
3852 | } | 3852 | } |
3853 | } else { | 3853 | } else { |
3854 | buf[1] = buf[0]; | 3854 | buf[1] = buf[0]; |