commit f14096e286ce2d86355ad4e481495874f8e8171b
parent b8b29ff138c08d8c0c838f771c01ace9b4db719d
Author: Benno Schulenberg <bensberg@justemail.net>
Date: Fri, 4 Apr 2014 07:50:41 +0000
Avoiding two more compilation warnings.
git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@4715 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
Diffstat:
3 files changed, 6 insertions(+), 3 deletions(-)
diff --git 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
@@ -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
@@ -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;