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

tweaks: condense some declarations by reshuffling

master
Benno Schulenberg 2017-03-29 21:35:56 +02:00
parent 582a624998
commit bc9862fbff
1 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/nano.c
View File

@ -1812,16 +1812,13 @@ int do_mouse(void)
* TRUE. */ * TRUE. */
void do_output(char *output, size_t output_len, bool allow_cntrls) void do_output(char *output, size_t output_len, bool allow_cntrls)
{ {
size_t current_len, i = 0;
#ifndef NANO_TINY
size_t orig_rows = 0, original_row = 0;
#endif
char *char_buf = charalloc(mb_cur_max()); char *char_buf = charalloc(mb_cur_max());
int char_len; int char_len;
size_t current_len = strlen(openfile->current->data);
current_len = strlen(openfile->current->data); size_t i = 0;
#ifndef NANO_TINY #ifndef NANO_TINY
size_t orig_rows = 0, original_row = 0;
if (ISSET(SOFTWRAP)) { if (ISSET(SOFTWRAP)) {
if (openfile->current_y == editwinrows - 1) if (openfile->current_y == editwinrows - 1)
original_row = xplustabs() / editwincols; original_row = xplustabs() / editwincols;
@ -1850,8 +1847,6 @@ void do_output(char *output, size_t output_len, bool allow_cntrls)
refresh_needed = TRUE; refresh_needed = TRUE;
} }
assert(openfile->current_x <= current_len);
/* Make room for the new character and copy it into the line. */ /* Make room for the new character and copy it into the line. */
openfile->current->data = charealloc(openfile->current->data, openfile->current->data = charealloc(openfile->current->data,
current_len + char_len + 1); current_len + char_len + 1);