From: Roy Marples Date: Mon, 10 Nov 2014 19:22:43 +0000 (+0000) Subject: eloop queue 0 is all queues, respect it. X-Git-Tag: v6.6.2~9 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7c176f27f81b098ed1e2a3ccf707660d5a0f74cb;p=thirdparty%2Fdhcpcd.git eloop queue 0 is all queues, respect it. --- diff --git a/eloop.c b/eloop.c index 61a8eb35..1e9d6491 100644 --- a/eloop.c +++ b/eloop.c @@ -239,7 +239,8 @@ eloop_q_timeout_delete(struct eloop_ctx *ctx, int queue, struct eloop_timeout *t, *tt; TAILQ_FOREACH_SAFE(t, &ctx->timeouts, next, tt) { - if (t->queue == queue && t->arg == arg && + if ((queue == 0 || t->queue == queue) && + t->arg == arg && (!callback || t->callback == callback)) { TAILQ_REMOVE(&ctx->timeouts, t, next);