ariadne
/
smol
2
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

tweaks: rename some variables to be more readable

master
Benno Schulenberg 2016-05-30 10:53:08 +02:00
parent 5864d97590
commit 21d9bd1107
1 changed files with 21 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
src/winio.c
View File

@ -1792,18 +1792,17 @@ char *display_string(const char *buf, size_t start_col, size_t len, bool
if (is_cntrl_mbchar(buf_mb)) { if (is_cntrl_mbchar(buf_mb)) {
if (column < start_col) { if (column < start_col) {
char *ctrl_buf_mb = charalloc(mb_cur_max()); char *character = charalloc(mb_cur_max());
int ctrl_buf_mb_len, i; int charlen, i;
ctrl_buf_mb = control_mbrep(buf_mb, ctrl_buf_mb, character = control_mbrep(buf_mb, character, &charlen);
&ctrl_buf_mb_len);
for (i = 0; i < ctrl_buf_mb_len; i++) for (i = 0; i < charlen; i++)
converted[index++] = ctrl_buf_mb[i]; converted[index++] = character[i];
start_col += mbwidth(ctrl_buf_mb); start_col += mbwidth(character);
free(ctrl_buf_mb); free(character);
start_index += buf_mb_len; start_index += buf_mb_len;
} }
@ -1868,25 +1867,25 @@ char *display_string(const char *buf, size_t start_col, size_t len, bool
} }
/* If buf contains a control character, interpret it. */ /* If buf contains a control character, interpret it. */
} else if (is_cntrl_mbchar(buf_mb)) { } else if (is_cntrl_mbchar(buf_mb)) {
char *ctrl_buf_mb = charalloc(mb_cur_max()); char *character = charalloc(mb_cur_max());
int ctrl_buf_mb_len, i; int charlen, i;
converted[index++] = '^'; converted[index++] = '^';
start_col++; start_col++;
ctrl_buf_mb = control_mbrep(buf_mb, ctrl_buf_mb, &ctrl_buf_mb_len); character = control_mbrep(buf_mb, character, &charlen);
for (i = 0; i < ctrl_buf_mb_len; i++) for (i = 0; i < charlen; i++)
converted[index++] = ctrl_buf_mb[i]; converted[index++] = character[i];
start_col += mbwidth(ctrl_buf_mb); start_col += mbwidth(character);
free(ctrl_buf_mb); free(character);
/* If buf contains a non-control character, interpret it. If buf /* If buf contains a non-control character, interpret it. If buf
* contains an invalid multibyte sequence, display it as such. */ * contains an invalid multibyte sequence, display it as such. */
} else { } else {
char *nctrl_buf_mb = charalloc(mb_cur_max()); char *character = charalloc(mb_cur_max());
int nctrl_buf_mb_len, i; int charlen, i;
#ifdef ENABLE_UTF8 #ifdef ENABLE_UTF8
/* Make sure an invalid sequence-starter byte is properly /* Make sure an invalid sequence-starter byte is properly
@ -1895,14 +1894,14 @@ char *display_string(const char *buf, size_t start_col, size_t len, bool
if (using_utf8() && buf_mb_len == 1) if (using_utf8() && buf_mb_len == 1)
buf_mb[1] = '\0'; buf_mb[1] = '\0';
#endif #endif
nctrl_buf_mb = mbrep(buf_mb, nctrl_buf_mb, &nctrl_buf_mb_len); character = mbrep(buf_mb, character, &charlen);
for (i = 0; i < nctrl_buf_mb_len; i++) for (i = 0; i < charlen; i++)
converted[index++] = nctrl_buf_mb[i]; converted[index++] = character[i];
start_col += mbwidth(nctrl_buf_mb); start_col += mbwidth(character);
free(nctrl_buf_mb); free(character);
} }
start_index += buf_mb_len; start_index += buf_mb_len;