diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/uv_link_t.c | 25 |
1 files changed, 10 insertions, 15 deletions
diff --git a/src/uv_link_t.c b/src/uv_link_t.c index a3359cb..32fa6c9 100644 --- a/src/uv_link_t.c +++ b/src/uv_link_t.c @@ -85,25 +85,22 @@ void uv_link_close(uv_link_t* link, uv_link_close_cb cb) { } +static void uv_link_close_join(uv_link_t* link) { + if (--link->close_waiting == 0) + return link->saved_close_cb(link); +} + + void uv_link_maybe_close(uv_link_t* link) { - uv_link_close_cb cb; uv_link_t* source; - if (link->pending_close_cb == NULL) + if (link->pending_close_source == NULL) return; - cb = link->pending_close_cb; source = link->pending_close_source; - link->pending_close_cb = NULL; link->pending_close_source = NULL; - return uv_link_propagate_close(link, source, cb); -} - - -static void uv_link_close_join(uv_link_t* link) { - if (--link->close_waiting == 0) - return link->saved_close_cb(link); + link->methods->close(link, source, uv_link_close_join); } @@ -134,12 +131,10 @@ void uv_link_propagate_close(uv_link_t* link, uv_link_t* source, if (child != NULL) CHECK_EQ(uv_link_unchain(root, child), 0, "close unchain"); - if (root->close_depth == 0) { + if (root->close_depth == 0) root->methods->close(root, source, uv_link_close_join); - } else { - root->pending_close_cb = uv_link_close_join; + else root->pending_close_source = source; - } root = child; } } |