From e8806029447040591775cab4fb5bbd355d65bbdf Mon Sep 17 00:00:00 2001 From: Paul LeoNerd Evans Date: Sat, 8 Nov 2008 17:47:57 +0000 Subject: Pass driver_info as explicit void* parameter into driver methods --- driver-csi.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'driver-csi.c') diff --git a/driver-csi.c b/driver-csi.c index 1203a00..fe885b2 100644 --- a/driver-csi.c +++ b/driver-csi.c @@ -130,9 +130,9 @@ abort_free_csi: return NULL; } -static void free_driver(void *private) +static void free_driver(void *info) { - termkey_csi *csi = private; + termkey_csi *csi = info; free(csi->csifuncs); csi->csifuncs = NULL; @@ -286,12 +286,12 @@ static termkey_result getkey_ss3(termkey_t *tk, termkey_csi *csi, size_t introle return TERMKEY_RES_KEY; } -static termkey_result getkey(termkey_t *tk, termkey_key *key, int force) +static termkey_result getkey(termkey_t *tk, void *info, termkey_key *key, int force) { if(tk->buffcount == 0) return tk->is_closed ? TERMKEY_RES_EOF : TERMKEY_RES_NONE; - termkey_csi *csi = tk->driver_info; + termkey_csi *csi = info; // Now we're sure at least 1 byte is valid unsigned char b0 = CHARAT(0); -- cgit v1.2.3