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

Simplify utf8decodebyte using some locals 

These local variables help to make expressions simpler and avoid
use a pointer as induction variable in a for loop.
This commit is contained in:
Roberto E. Vargas Caballero 2014-08-24 16:25:33 +02:00
parent c7a945c408
commit 23af75fc75
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
st.c
View File

@ -453,7 +453,7 @@ static void getbuttoninfo(XEvent *);
static void mousereport(XEvent *); static void mousereport(XEvent *);
static size_t utf8decode(char *, long *, size_t); static size_t utf8decode(char *, long *, size_t);
static long utf8decodebyte(char, size_t *); static long utf8decodebyte(uchar, size_t *);
static size_t utf8encode(long, char *, size_t); static size_t utf8encode(long, char *, size_t);
static char utf8encodebyte(long, size_t); static char utf8encodebyte(long, size_t);
static size_t utf8len(char *); static size_t utf8len(char *);
@ -590,11 +590,18 @@ utf8decode(char *c, long *u, size_t clen) {
} }
long long
utf8decodebyte(char c, size_t *i) { utf8decodebyte(uchar c, size_t *len) {
for(*i = 0; *i < LEN(utfmask); ++(*i)) size_t i;
if(((uchar)c & utfmask[*i]) == utfbyte[*i]) long ret = 0;
return (uchar)c & ~utfmask[*i];
return 0; for(i = 0; i < LEN(utfmask); ++i) {
if((c & utfmask[i]) == utfbyte[i]) {
ret = c & ~utfmask[i];
break;
}
}
*len = i;
return ret;
} }
size_t size_t