From c709c104a1bcd836b338e06fcdce6a5ff9609609 Mon Sep 17 00:00:00 2001 From: Benno Schulenberg Date: Wed, 30 Mar 2016 12:30:14 +0000 Subject: [PATCH] Unwrapping a couple of lines. git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@5780 35c25a1d-7b9e-4130-9fde-d3aeb78583b8 --- ChangeLog | 1 + src/text.c | 14 +++++--------- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4b8e1189..55e72e9c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -7,6 +7,7 @@ * src/winio.c (spotlight): Rename a variable for clarity. * src/files.c (input_tab), src/prompt.c (get_prompt_string): Rename a variable to better indicate booleanness. + * src/text.c (do_int_speller): Unwrap a few lines. 2016-03-29 Benno Schulenberg * src/nano.c (main), src/text.c (do_justify, do_verbatim_input), diff --git a/src/text.c b/src/text.c index 38dd4984..e2883678 100644 --- a/src/text.c +++ b/src/text.c @@ -2509,8 +2509,7 @@ const char *do_int_speller(const char *tempfile_name) int spell_status, sort_status, uniq_status; /* Create all three pipes up front. */ - if (pipe(spell_fd) == -1 || pipe(sort_fd) == -1 || - pipe(uniq_fd) == -1) + if (pipe(spell_fd) == -1 || pipe(sort_fd) == -1 || pipe(uniq_fd) == -1) return _("Could not create pipe"); statusbar(_("Creating misspelled word list, please wait...")); @@ -2612,12 +2611,10 @@ const char *do_int_speller(const char *tempfile_name) read_buff_size = pipe_buff_size + 1; read_buff = read_buff_ptr = charalloc(read_buff_size); - while ((bytesread = read(uniq_fd[0], read_buff_ptr, - pipe_buff_size)) > 0) { + while ((bytesread = read(uniq_fd[0], read_buff_ptr, pipe_buff_size)) > 0) { read_buff_read += bytesread; read_buff_size += pipe_buff_size; - read_buff = read_buff_ptr = charealloc(read_buff, - read_buff_size); + read_buff = read_buff_ptr = charealloc(read_buff, read_buff_size); read_buff_ptr += read_buff_read; } @@ -2663,7 +2660,7 @@ const char *do_int_speller(const char *tempfile_name) if (WIFEXITED(uniq_status) == 0 || WEXITSTATUS(uniq_status)) return _("Error invoking \"uniq\""); - /* Otherwise... */ + /* When all went okay. */ return NULL; close_pipes_and_exit: @@ -3011,8 +3008,7 @@ void do_linter(void) read_buff_size = pipe_buff_size + 1; read_buff = read_buff_ptr = charalloc(read_buff_size); - while ((bytesread = read(lint_fd[0], read_buff_ptr, - pipe_buff_size)) > 0) { + while ((bytesread = read(lint_fd[0], read_buff_ptr, pipe_buff_size)) > 0) { #ifdef DEBUG fprintf(stderr, "text.c:do_linter:%ld bytes (%s)\n", (long)bytesread, read_buff_ptr); #endif -- 2.39.5