- assert_se(epoll_ctl(u->meta.manager->epoll_fd, EPOLL_CTL_DEL, *id, NULL) >= 0);
- assert_se(close_nointr(*id) == 0);
- *id = -1;
+ assert(w->type == WATCH_TIMER && w->unit == u);
+
+ assert_se(epoll_ctl(u->meta.manager->epoll_fd, EPOLL_CTL_DEL, w->fd, NULL) >= 0);
+ assert_se(close_nointr(w->fd) == 0);
+
+ w->fd = -1;
+ w->type = WATCH_INVALID;
+ w->unit = NULL;