minor variable tweaks

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

diff --git a/ChangeLog b/ChangeLog
index 45f6b9e89b4bf6f018e6a4359ff5e63afffa455a..a813278e76c5e2916603271ef9e5f3366fb21e9c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,10 @@ CVS code -
   do_verbatim_input()
        - If constant cursor position display is on when we finish, make
          sure the cursor position is displayed properly. (DLR)
+  do_alt_speller()
+       - Rename variable msglen to msg_len, for consistency, and make
+         it a size_t instead of an int.  Also remove unnecessary
+         initialization of altspell_error. (DLR)
   allow_pending_sigwinch()
        - Simplify by using the "?" operator instead of an if clause.
          (DLR)

diff --git a/src/nano.c b/src/nano.c
index 5da58473cf3db7962a119a048921aaee09bbb182..b9a3ecd9fac8cf8a16f69f314e5a4beb6d2ce5ef 100644 (file)
--- a/src/nano.c
+++ b/src/nano.c
@@ -2398,9 +2398,9 @@ const char *do_alt_speller(char *tempfile_name)
 
     if (!WIFEXITED(alt_spell_status) ||
                WEXITSTATUS(alt_spell_status) != 0) {
-       char *altspell_error = NULL;
+       char *altspell_error;
        char *invoke_error = _("Could not invoke \"%s\"");
-       int msglen = strlen(invoke_error) + strlen(alt_speller) + 2;
+       size_t msg_len = strlen(invoke_error) + strlen(alt_speller) + 2;
 
 #ifndef NANO_SMALL
        /* Turn the mark back on if it was on before. */
@@ -2408,8 +2408,8 @@ const char *do_alt_speller(char *tempfile_name)
            SET(MARK_ISSET);
 #endif
 
-       altspell_error = charalloc(msglen);
-       snprintf(altspell_error, msglen, invoke_error, alt_speller);
+       altspell_error = charalloc(msg_len);
+       snprintf(altspell_error, msg_len, invoke_error, alt_speller);
        return altspell_error;
     }