From 7b9f379923fc97817c873e25b34d46bb68897f8e Mon Sep 17 00:00:00 2001 From: Ben Noordhuis Date: Wed, 15 Mar 2017 12:00:57 +0100 Subject: [PATCH] samples: update timer callback prototype MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The socks5 proxy sample application was still using the old prototype where timer callbacks take a second 'status' parameter but that was removed in commit db2a9072 ("unix, windows: removed unused status parameter") from March 2014. PR-URL: https://github.com/libuv/libuv/pull/1250 Reviewed-By: Colin Ihrig Reviewed-By: Saúl Ibarra Corretgé --- samples/socks5-proxy/client.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/samples/socks5-proxy/client.c b/samples/socks5-proxy/client.c index ae9913a1..aa2a91c9 100644 --- a/samples/socks5-proxy/client.c +++ b/samples/socks5-proxy/client.c @@ -95,7 +95,7 @@ static int do_kill(client_ctx *cx); static int do_almost_dead(client_ctx *cx); static int conn_cycle(const char *who, conn *a, conn *b); static void conn_timer_reset(conn *c); -static void conn_timer_expire(uv_timer_t *handle, int status); +static void conn_timer_expire(uv_timer_t *handle); static void conn_getaddrinfo(conn *c, const char *hostname); static void conn_getaddrinfo_done(uv_getaddrinfo_t *req, int status, @@ -582,10 +582,9 @@ static void conn_timer_reset(conn *c) { 0)); } -static void conn_timer_expire(uv_timer_t *handle, int status) { +static void conn_timer_expire(uv_timer_t *handle) { conn *c; - CHECK(0 == status); c = CONTAINER_OF(handle, conn, timer_handle); c->result = UV_ETIMEDOUT; do_next(c->client);