diff options
| author | Vladimir Homutov <vl@nginx.com> | 2021-06-21 09:42:43 +0300 |
|---|---|---|
| committer | Vladimir Homutov <vl@nginx.com> | 2021-06-21 09:42:43 +0300 |
| commit | 8b927107287094f018cc6f5addc543e79f88ec74 (patch) | |
| tree | d34f30eb724b1ee0d0140e6e0c1d47a7dcc8a0b7 /src/event/ngx_event_timer.c | |
| parent | a407583ef17d9afa9e48eb8d0749289a0af84388 (diff) | |
| download | nginx-8b927107287094f018cc6f5addc543e79f88ec74.tar.gz nginx-8b927107287094f018cc6f5addc543e79f88ec74.tar.bz2 | |
Core: added the ngx_rbtree_data() macro.
Diffstat (limited to 'src/event/ngx_event_timer.c')
| -rw-r--r-- | src/event/ngx_event_timer.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/event/ngx_event_timer.c b/src/event/ngx_event_timer.c index 698b88fae..35052bc29 100644 --- a/src/event/ngx_event_timer.c +++ b/src/event/ngx_event_timer.c @@ -73,7 +73,7 @@ ngx_event_expire_timers(void) return; } - ev = (ngx_event_t *) ((char *) node - offsetof(ngx_event_t, timer)); + ev = ngx_rbtree_data(node, ngx_event_t, timer); ngx_log_debug2(NGX_LOG_DEBUG_EVENT, ev->log, 0, "event timer del: %d: %M", @@ -113,7 +113,7 @@ ngx_event_no_timers_left(void) node; node = ngx_rbtree_next(&ngx_event_timer_rbtree, node)) { - ev = (ngx_event_t *) ((char *) node - offsetof(ngx_event_t, timer)); + ev = ngx_rbtree_data(node, ngx_event_t, timer); if (!ev->cancelable) { return NGX_AGAIN; |