nano

commit b41405233f901a54a79669dfe5387a32614992b8
parent 88561506c939012b151a1cc480ee2f65017094df
Author: Benno Schulenberg <bensberg@telfort.nl>
Date:   Mon, 20 Jul 2020 12:35:29 +0200

tweaks: remove some superfluous conditions

When get_byte_kbinput() is called, it has already been determined that
the keyboard input is a digit from zero to nine (or from zero to two
for the first digit), so there is no need to check this again.

Diffstat:
M
src/winio.c
 | 
15
+++++----------

1 file changed, 5 insertions(+), 10 deletions(-)
diff --git a/src/winio.c b/src/winio.c
@@ -951,7 +951,7 @@ int parse_kbinput(WINDOW *win)
 				double_esc = FALSE;
 				escapes = 0;
 			} else if (key_buffer_len == 0) {
-				if ('0' <= keycode && ((keycode <= '2' && digit_count == 0) ||
+				if ('0' <= keycode && (keycode <= '2' ||
 										(keycode <= '9' && digit_count > 0))) {
 					/* Two escapes followed by one digit, and no other codes
 					 * are waiting: byte sequence mode.  If the range of the
@@ -1322,17 +1322,13 @@ int get_byte_kbinput(int kbinput)
 	 * If yes, store it.  If no, return the digit (or character) itself. */
 	switch (++digit_count) {
 		case 1:
-			/* The first digit (the 100's position) must be from zero to two. */
-			if ('0' <= kbinput && kbinput <= '2')
-				byte = (kbinput - '0') * 100;
-			else
-				retval = kbinput;
+			/* The first digit (the 100's position) is from zero to two. */
+			byte = (kbinput - '0') * 100;
 			break;
 		case 2:
 			/* The second digit (the 10's position) must be from zero to five
 			 * if the first was two, and may be any decimal value otherwise. */
-			if ((byte < 200 && '0' <= kbinput && kbinput <= '9') ||
-								('0' <= kbinput && kbinput <= '5'))
+			if (byte < 200 || kbinput <= '5')
 				byte += (kbinput - '0') * 10;
 			else
 				retval = kbinput;
@@ -1341,8 +1337,7 @@ int get_byte_kbinput(int kbinput)
 			/* The third digit (the 1's position) must be from zero to five
 			 * if the first was two and the second was five, and may be any
 			 * decimal value otherwise. */
-			if ((byte < 250 && '0' <= kbinput && kbinput <= '9') ||
-								('0' <= kbinput && kbinput <= '5')) {
+			if (byte < 250 || kbinput <= '5') {
 				byte += kbinput - '0';
 				/* The byte sequence is complete. */
 				retval = byte;