Faris
/
st
mirror of git://git.suckless.org/st
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove last parameter of utf8encode 

This parameter was always UTF_SIZ, so it is better remove it and
use directly UTF_SIZ in in.
This commit is contained in:
Roberto E. Vargas Caballero 2014-09-09 05:42:44 +02:00
parent 23af75fc75
commit 28f56c8842
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
st.c
View File

@ -454,7 +454,7 @@ static void mousereport(XEvent *);
static size_t utf8decode(char *, long *, size_t); static size_t utf8decode(char *, long *, size_t);
static long utf8decodebyte(uchar, size_t *); static long utf8decodebyte(uchar, size_t *);
static size_t utf8encode(long, char *, size_t); static size_t utf8encode(long, char *);
static char utf8encodebyte(long, size_t); static char utf8encodebyte(long, size_t);
static size_t utf8len(char *); static size_t utf8len(char *);
static size_t utf8validate(long *, size_t); static size_t utf8validate(long *, size_t);
@ -605,11 +605,11 @@ utf8decodebyte(uchar c, size_t *len) {
} }
size_t size_t
utf8encode(long u, char *c, size_t clen) { utf8encode(long u, char *c) {
size_t len, i; size_t len, i;
len = utf8validate(&u, 0); len = utf8validate(&u, 0);
if(clen < len) if(len > UTF_SIZ)
return 0; return 0;
for(i = len - 1; i != 0; --i) { for(i = len - 1; i != 0; --i) {
c[i] = utf8encodebyte(u, 0); c[i] = utf8encodebyte(u, 0);
@ -1264,7 +1264,7 @@ ttyread(void) {
buflen += ret; buflen += ret;
ptr = buf; ptr = buf;
while((charsize = utf8decode(ptr, &unicodep, buflen))) { while((charsize = utf8decode(ptr, &unicodep, buflen))) {
utf8encode(unicodep, s, UTF_SIZ); utf8encode(unicodep, s);
tputc(s, charsize); tputc(s, charsize);
ptr += charsize; ptr += charsize;
buflen -= charsize; buflen -= charsize;
@ -3741,7 +3741,7 @@ kpress(XEvent *ev) {
if(IS_SET(MODE_8BIT)) { if(IS_SET(MODE_8BIT)) {
if(*buf < 0177) { if(*buf < 0177) {
c = *buf | 0x80; c = *buf | 0x80;
len = utf8encode(c, buf, UTF_SIZ); len = utf8encode(c, buf);
} }
} else { } else {
buf[1] = buf[0]; buf[1] = buf[0];