aniani/trader
1
0
Fork 0
mirror of https://git.zap.org.au/git/trader.git synced 2024-12-04 14:46:45 -05:00
Code

Bug fix: char may be unsigned on some platforms

Browse Source 
The function wctob() returns an int that can be -1; a conversion to
unsigned char will make that value 0xFF.  Although the "if" statement
still works in this case, we should be more diligent in our programming.
This commit is contained in:
John Zaitseff 2018-08-06 13:57:16 +10:00
parent 61e6dec3a3
commit eb0ed43ce2
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/intf.c
View File

@ -1763,7 +1763,7 @@ int getwch (WINDOW *win, wint_t *restrict wch)
int ret = wget_wch(win, wch);
if (ret == OK) {
char c = wctob(*wch);
int c = wctob(*wch);
if ((c >= 0 && c < ' ') || c == 0x7F) {
/* Make control characters (and DEL) appear to be similar to
function keys. This assumes the KEY_xxx definitions do
@ -1771,7 +1771,7 @@ int getwch (WINDOW *win, wint_t *restrict wch)
(due to the same codes being returned by getch()). We do
not use iswcntrl() as certain additional Unicode
characters are also control characters (eg, U+2028) */
*wch = (unsigned char) c;
*wch = (wint_t) c;
ret = KEY_CODE_YES;
}
}
@ -1835,11 +1835,11 @@ int getwch (WINDOW *win, wint_t *restrict wch)
// A valid multibyte sequence
memcpy(mbstate, &mbcopy, sizeof(mbstate_t));
char c = wctob(val);
int c = wctob(val);
if ((c >= 0 && c < ' ') || c == 0x7F) {
/* Make control characters (and DEL) appear to be
similar to function keys. */
val = (unsigned char) c;
val = (wchar_t) c;
ret = KEY_CODE_YES;
} else {
// An ordinary key