in get_input(), simplify to avoid an unnecessary key_buffer_len check

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

diff --git a/ChangeLog b/ChangeLog
index 75128b5661404c69620caecec39570ec4556d3b5..fd557c7127c946a9b8e682513cb4e555348f7faf 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,9 @@ CVS code -
          properly reset when we get out of all statusbar prompts.
          Changes to do_insertfile(), do_writeout(),
          handle_sigwinch(), main(), and do_prompt_abort(). (DLR)
+- winio.c:
+  get_input()
+       - Simplify to avoid an unnecessary key_buffer_len check. (DLR)
 
 GNU nano 1.9.99pre1 - 2006.08.29
 - General:

diff --git a/src/winio.c b/src/winio.c
index bec32fe6f0077baf5734451fd36c6ebb11efc12b..3b08b70242fa48ca450ee39040bd8dccc40a33d8 100644 (file)
--- a/src/winio.c
+++ b/src/winio.c
@@ -254,10 +254,12 @@ int *get_input(WINDOW *win, size_t input_len)
 #endif
 
     if (key_buffer_len == 0) {
-       if (win != NULL)
+       if (win != NULL) {
            get_key_buffer(win);
 
-       if (key_buffer_len == 0)
+           if (key_buffer_len == 0)
+               return NULL;
+       } else
            return NULL;
     }