mirrors/nano
1
0
Fork 0
mirror of git://git.sv.gnu.org/nano.git synced 2024-11-25 06:09:38 +03:00
Code Issues Packages Projects Releases Wiki Activity

Renaming a variable, for contrast and correctness.

Browse Source 
git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@5670 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
This commit is contained in:
Benno Schulenberg 2016-02-23 08:31:57 +00:00
parent 6a002f5196
commit 8a2dd978f8
2 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,3 +1,7 @@
2016-02-23 Benno Schulenberg <bensberg@justemail.net>
* src/prompt.c (do_statusbar_output, do_statusbar_delete):
Rename a variable, for contrast and correctness.
2016-02-22 Chris Allegretta <chrisa@asty.org> 2016-02-22 Chris Allegretta <chrisa@asty.org>
* Add ability to kill the trailing spaces when justifying * Add ability to kill the trailing spaces when justifying
code. New nanorc option kill_spaces_on_justify, we'll see code. New nanorc option kill_spaces_on_justify, we'll see

22
src/prompt.c
View File

@ -248,7 +248,7 @@ void do_statusbar_output(int *the_input, size_t input_len,
{ {
char *output = charalloc(input_len + 1); char *output = charalloc(input_len + 1);
char *char_buf = charalloc(mb_cur_max()); char *char_buf = charalloc(mb_cur_max());
int i, char_buf_len; int i, char_len;
assert(answer != NULL); assert(answer != NULL);
@ -274,23 +274,23 @@ void do_statusbar_output(int *the_input, size_t input_len,
} }
/* Interpret the next multibyte character. */ /* Interpret the next multibyte character. */
char_buf_len = parse_mbchar(output + i, char_buf, NULL); char_len = parse_mbchar(output + i, char_buf, NULL);
i += char_buf_len; i += char_len;
/* When filtering, skip any ASCII control character. */ /* When filtering, skip any ASCII control character. */
if (filtering && is_ascii_cntrl_char(*(output + i - char_buf_len))) if (filtering && is_ascii_cntrl_char(*(output + i - char_len)))
continue; continue;
assert(statusbar_x <= strlen(answer)); assert(statusbar_x <= strlen(answer));
/* Insert the typed character into the existing answer string. */ /* Insert the typed character into the existing answer string. */
answer = charealloc(answer, strlen(answer) + char_buf_len + 1); answer = charealloc(answer, strlen(answer) + char_len + 1);
charmove(answer + statusbar_x + char_buf_len, answer + statusbar_x, charmove(answer + statusbar_x + char_len, answer + statusbar_x,
strlen(answer) - statusbar_x + 1); strlen(answer) - statusbar_x + 1);
strncpy(answer + statusbar_x, char_buf, char_buf_len); strncpy(answer + statusbar_x, char_buf, char_len);
statusbar_x += char_buf_len; statusbar_x += char_len;
} }
free(char_buf); free(char_buf);
@ -348,12 +348,12 @@ void do_statusbar_delete(void)
statusbar_pww = statusbar_xplustabs(); statusbar_pww = statusbar_xplustabs();
if (answer[statusbar_x] != '\0') { if (answer[statusbar_x] != '\0') {
int char_buf_len = parse_mbchar(answer + statusbar_x, NULL, NULL); int char_len = parse_mbchar(answer + statusbar_x, NULL, NULL);
assert(statusbar_x < strlen(answer)); assert(statusbar_x < strlen(answer));
charmove(answer + statusbar_x, answer + statusbar_x + char_buf_len, charmove(answer + statusbar_x, answer + statusbar_x + char_len,
strlen(answer) - statusbar_x - char_buf_len + 1); strlen(answer) - statusbar_x - char_len + 1);
align(&answer); align(&answer);
update_the_statusbar(); update_the_statusbar();