d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Grab all the information we need about a character with one call to

Browse Source 
__maskrune() instead of one direct call and one through iswprint().
This commit is contained in:
Tim J. Robbins 2004-05-23 13:20:09 +00:00
parent eadf519a78
commit 675e7ddbee
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/libc/locale/wcwidth.c
View File

@ -51,15 +51,13 @@ __FBSDID("$FreeBSD$");
int
wcwidth(wchar_t wc)
{
int width;
unsigned int x;
if (wc == L'\0')
return (0);
width = __maskrune(wc, _CTYPE_SWM);
/* 0 is autowidth (default) */
return (width ? (int)((unsigned)width >> _CTYPE_SWS)
: (iswprint(wc) ? 1 : -1));
x = (unsigned int)__maskrune(wc, _CTYPE_SWM|_CTYPE_R);
if ((x & _CTYPE_SWM) != 0)
return ((x & _CTYPE_SWM) >> _CTYPE_SWS);
return ((x & _CTYPE_R) != 0 ? 1 : -1);
}