From 10d3024a6af956bf8cd7dc61a5e41864b6fbc4f6 Mon Sep 17 00:00:00 2001 From: Paul LeoNerd Evans Date: Wed, 8 Oct 2008 00:44:33 +0100 Subject: Pass an explicit 'force' parameter into driver's getkey rather than relying on non-zero waittime --- termkey.c | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) (limited to 'termkey.c') diff --git a/termkey.c b/termkey.c index 98726fd..a5f73db 100644 --- a/termkey.c +++ b/termkey.c @@ -363,19 +363,12 @@ static termkey_result getkey_simple(termkey_t *tk, termkey_key *key) termkey_result termkey_getkey(termkey_t *tk, termkey_key *key) { - return (*tk->driver.getkey)(tk, key); + return (*tk->driver.getkey)(tk, key, 0); } termkey_result termkey_getkey_force(termkey_t *tk, termkey_key *key) { - int old_waittime = tk->waittime; - tk->waittime = 0; - - termkey_result ret = termkey_getkey(tk, key); - - tk->waittime = old_waittime; - - return ret; + return (*tk->driver.getkey)(tk, key, 1); } termkey_result termkey_waitkey(termkey_t *tk, termkey_key *key) -- cgit v1.2.3-54-g00ecf