From d12e169c1e733b255d146847ed57037b74681285 Mon Sep 17 00:00:00 2001 From: Garrett D'Amore Date: Sat, 19 Dec 2020 10:21:54 -0800 Subject: fixes #1372 nni_reap could be smaller --- src/supplemental/websocket/websocket.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'src/supplemental/websocket/websocket.c') diff --git a/src/supplemental/websocket/websocket.c b/src/supplemental/websocket/websocket.c index 20adf626..daf1be13 100644 --- a/src/supplemental/websocket/websocket.c +++ b/src/supplemental/websocket/websocket.c @@ -47,7 +47,7 @@ typedef struct ws_header { struct nni_ws { nng_stream ops; nni_list_node node; - nni_reap_item reap; + nni_reap_node reap; bool server; bool closed; bool ready; @@ -1251,10 +1251,15 @@ ws_fini(void *arg) NNI_FREE_STRUCT(ws); } +static nni_reap_list ws_reap_list = { + .rl_offset = offsetof(nni_ws, reap), + .rl_func = ws_fini, +}; + static void ws_reap(nni_ws *ws) { - nni_reap(&ws->reap, ws_fini, ws); + nni_reap(&ws_reap_list, ws); } static void @@ -2656,7 +2661,7 @@ static void ws_str_free(void *arg) { nni_ws *ws = arg; - nni_reap(&ws->reap, ws_fini, ws); + ws_reap(ws); } static void -- cgit v1.2.3-70-g09d2