tweaks: rename two variables, to be more distinctive

master
Benno Schulenberg 2017-02-28 15:07:47 +01:00
parent 48643cbdf3
commit a80ade38d7
1 changed files with 8 additions and 8 deletions

View File

@ -1491,34 +1491,34 @@ int *parse_verbatim_kbinput(WINDOW *win, size_t *count)
#ifdef ENABLE_UTF8 #ifdef ENABLE_UTF8
if (using_utf8()) { if (using_utf8()) {
/* Check whether the first code is a valid starter digit: 0 or 1. */ /* Check whether the first code is a valid starter digit: 0 or 1. */
long uni = get_unicode_kbinput(win, *kbinput); long unicode = get_unicode_kbinput(win, *kbinput);
/* If the first code isn't the digit 0 nor 1, put it back. */ /* If the first code isn't the digit 0 nor 1, put it back. */
if (uni != ERR) if (unicode != ERR)
unget_input(kbinput, 1); unget_input(kbinput, 1);
/* Otherwise, continue reading in digits until we have a complete /* Otherwise, continue reading in digits until we have a complete
* Unicode value, and put back the corresponding byte(s). */ * Unicode value, and put back the corresponding byte(s). */
else { else {
char *uni_mb; char *multibyte;
int onebyte, i; int onebyte, i;
while (uni == ERR) { while (unicode == ERR) {
free(kbinput); free(kbinput);
while ((kbinput = get_input(win, 1)) == NULL) while ((kbinput = get_input(win, 1)) == NULL)
; ;
uni = get_unicode_kbinput(win, *kbinput); unicode = get_unicode_kbinput(win, *kbinput);
} }
/* Convert the Unicode value to a multibyte sequence. */ /* Convert the Unicode value to a multibyte sequence. */
uni_mb = make_mbchar(uni, (int *)count); multibyte = make_mbchar(unicode, (int *)count);
/* Insert the multibyte sequence into the input buffer. */ /* Insert the multibyte sequence into the input buffer. */
for (i = *count; i > 0 ; i--) { for (i = *count; i > 0 ; i--) {
onebyte = (unsigned char)uni_mb[i - 1]; onebyte = (unsigned char)multibyte[i - 1];
unget_input(&onebyte, 1); unget_input(&onebyte, 1);
} }
free(uni_mb); free(multibyte);
} }
} else } else
#endif /* ENABLE_UTF8 */ #endif /* ENABLE_UTF8 */