Renaming a variable, for contrast and correctness.

git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@5670 35c25a1d-7b9e-4130-9fde-d3aeb78583b8

diff --git a/ChangeLog b/ChangeLog
index 4377c815d21d11f9e1d048a0ea6b7951ceac1149..31f62a7b46a1719672816fb1b72f9b2b3a5962a6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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>
        * Add ability to kill the trailing spaces when justifying
        code.  New nanorc option kill_spaces_on_justify, we'll see

diff --git a/src/prompt.c b/src/prompt.c
index 8aa6c5342896125625ea9dc8606a1efdf5702117..dc3f614afa9016612e5474eb8e98cd07b2199ebf 100644 (file)
--- a/src/prompt.c
+++ b/src/prompt.c
@@ -248,7 +248,7 @@ void do_statusbar_output(int *the_input, size_t input_len,
 {
     char *output = charalloc(input_len + 1);
     char *char_buf = charalloc(mb_cur_max());
-    int i, char_buf_len;
+    int i, char_len;
 
     assert(answer != NULL);
 
@@ -274,23 +274,23 @@ void do_statusbar_output(int *the_input, size_t input_len,
        }
 
        /* 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. */
-       if (filtering && is_ascii_cntrl_char(*(output + i - char_buf_len)))
+       if (filtering && is_ascii_cntrl_char(*(output + i - char_len)))
            continue;
 
        assert(statusbar_x <= strlen(answer));
 
        /* Insert the typed character into the existing answer string. */
-       answer = charealloc(answer, strlen(answer) + char_buf_len + 1);
-       charmove(answer + statusbar_x + char_buf_len, answer + statusbar_x,
+       answer = charealloc(answer, strlen(answer) + char_len + 1);
+       charmove(answer + statusbar_x + char_len, answer + statusbar_x,
                                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);
@@ -348,12 +348,12 @@ void do_statusbar_delete(void)
     statusbar_pww = statusbar_xplustabs();
 
     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));
 
-       charmove(answer + statusbar_x, answer + statusbar_x + char_buf_len,
-                       strlen(answer) - statusbar_x - char_buf_len + 1);
+       charmove(answer + statusbar_x, answer + statusbar_x + char_len,
+                       strlen(answer) - statusbar_x - char_len + 1);
        align(&answer);
 
        update_the_statusbar();