luo980/libuv
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

samples: update timer callback prototype

Browse Source 
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 <cjihrig@gmail.com>
Reviewed-By: Saúl Ibarra Corretgé <saghul@gmail.com>
This commit is contained in:
Ben Noordhuis 2017-03-15 12:00:57 +01:00
parent 5fc8aecd81
commit 7b9f379923
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
samples/socks5-proxy/client.c
View File

@ -95,7 +95,7 @@ static int do_kill(client_ctx *cx);
static int do_almost_dead(client_ctx *cx); static int do_almost_dead(client_ctx *cx);
static int conn_cycle(const char *who, conn *a, conn *b); static int conn_cycle(const char *who, conn *a, conn *b);
static void conn_timer_reset(conn *c); 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(conn *c, const char *hostname);
static void conn_getaddrinfo_done(uv_getaddrinfo_t *req, static void conn_getaddrinfo_done(uv_getaddrinfo_t *req,
int status, int status,
@ -582,10 +582,9 @@ static void conn_timer_reset(conn *c) {
0)); 0));
} }
static void conn_timer_expire(uv_timer_t *handle, int status) { static void conn_timer_expire(uv_timer_t *handle) {
conn *c; conn *c;
CHECK(0 == status);
c = CONTAINER_OF(handle, conn, timer_handle); c = CONTAINER_OF(handle, conn, timer_handle);
c->result = UV_ETIMEDOUT; c->result = UV_ETIMEDOUT;
do_next(c->client); do_next(c->client);