From e666f8c50d0999b3e959eff723d637759345f317 Mon Sep 17 00:00:00 2001 From: Benno Schulenberg Date: Mon, 2 May 2016 21:58:43 +0200 Subject: [PATCH] input: write a few ifs more compactly --- src/winio.c | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/src/winio.c b/src/winio.c index af8e8181..70932515 100644 --- a/src/winio.c +++ b/src/winio.c @@ -250,21 +250,16 @@ void unget_kbinput(int kbinput, bool metakey, bool funckey) /* Try to read input_len characters from the keystroke buffer. If the * keystroke buffer is empty and win isn't NULL, try to read in more * characters from win and add them to the keystroke buffer before doing - * anything else. If the keystroke buffer is empty and win is NULL, - * return NULL. */ + * anything else. If the keystroke buffer is (still) empty, return NULL. */ int *get_input(WINDOW *win, size_t input_len) { int *input; - if (key_buffer_len == 0) { - if (win != NULL) { - get_key_buffer(win); + if (key_buffer_len == 0 && win != NULL) + get_key_buffer(win); - if (key_buffer_len == 0) - return NULL; - } else - return NULL; - } + if (key_buffer_len == 0) + return NULL; /* If input_len is greater than the length of the keystroke buffer, * only read the number of characters in the keystroke buffer. */