Avoiding two more compilation warnings.

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

diff --git a/ChangeLog b/ChangeLog
index eb4d14f139ee12fee8197447c9c3466b8fac2e43..0a6940494a94554c5c0c49f3453aa3ee4c98d527 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2014-04-04  Benno Schulenberg  <bensberg@justemail.net>
+       * src/{files.c,nano.c}: Avoid two more compilation warnings.
+
 2014-04-03  Benno Schulenberg  <bensberg@justemail.net>
        * configure.ac: Remove unused '*_support' variables.
        * doc/syntax/po.nanorc: New file, syntax colouring for PO files.

diff --git a/src/files.c b/src/files.c
index 4b25f6acb1b6cfe890694ffea2550cdfe25d0941..e7fb21df507b014c67a2b9e0e5fa63b8daaf66cf 100644 (file)
--- a/src/files.c
+++ b/src/files.c
@@ -1198,10 +1198,10 @@ void do_insertfile(
            if (ISSET(MULTIBUFFER)) {
                /* Update the screen to account for the current
                 * buffer. */
-               ssize_t savedposline, savedposcol;
-
                display_buffer();
+
 #ifndef NANO_TINY
+               ssize_t savedposline, savedposcol;
                if (!execute && ISSET(POS_HISTORY)
                        && check_poshistory(answer, &savedposline, &savedposcol))
                    do_gotolinecolumn(savedposline, savedposcol, FALSE, FALSE, FALSE, FALSE);

diff --git a/src/nano.c b/src/nano.c
index 52cbcc5e4c7e4f3587482643cc5098deec8b8238..78b7a60b3971e14c7355b9c47624a41fe08a4691 100644 (file)
--- a/src/nano.c
+++ b/src/nano.c
@@ -1938,7 +1938,7 @@ precalc_cleanup:
  * TRUE. */
 void do_output(char *output, size_t output_len, bool allow_cntrls)
 {
-    size_t current_len, orig_lenpt, i = 0;
+    size_t current_len, orig_lenpt = 0, i = 0;
     char *char_buf = charalloc(mb_cur_max());
     int char_buf_len;