Unroll ternary operator with unix_history functions.
authorDavid Griffith <dave@661.org>
Tue, 12 Feb 2019 12:21:48 +0000 (04:21 -0800)
committerDavid Griffith <dave@661.org>
Tue, 12 Feb 2019 12:21:48 +0000 (04:21 -0800)
src/curses/ux_input.c

index 542ffd0bbf5767d5f89b819818e0d3e84a8bc959..3c842b3b01feae8caf3da3965146c9e4e9d04edc 100644 (file)
@@ -608,12 +608,14 @@ zchar os_read_line (int bufmax, zchar *buf, int timeout, int width,
        case ZC_ARROW_UP: case ZC_ARROW_DOWN:
            if (searchpos < 0)
                searchpos = len;
-           if ((ch == ZC_ARROW_UP ? unix_history_back : unix_history_forward)
-               (buf, searchpos, max)) {
-               scrnset(x, ' ', len);
-               mvaddstr(y, x, (char *) buf);
-               scrpos = len = strlen((char *) buf);
-            }
+           if (ch == ZC_ARROW_UP)
+               unix_history_back(buf, searchpos, max);
+            else
+               unix_history_forward(buf, searchpos, max);
+
+           scrnset(x, ' ', len);
+           mvaddstr(y, x, (char *) buf);
+           scrpos = len = strlen((char *) buf);
            continue;
 
        /* Passthrough as up/down arrows for Beyond Zork. */