isa/sudo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Convert sudo to use BSD TAILQ macros instead of home ground tail

Browse Source 
queue functions.  This includes a private queue.h header derived
from FreeBSD.  It is simpler to just use our own header rather than
try to deal with macros that may or may not be present in various
queue.h incarnations.
This commit is contained in:
Todd C. Miller
2013-10-22 09:00:37 -06:00
parent fe0e953e9b
commit 923edabe6c
31 changed files with 962 additions and 299 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
common/event.c
View File

@@ -45,7 +45,6 @@
#include "missing.h"
#include "alloc.h"
#include "fatal.h"
#include "list.h"
#include "sudo_debug.h"
#include "sudo_event.h"
@@ -58,6 +57,7 @@ sudo_ev_base_alloc(void)
debug_decl(sudo_ev_base_alloc, SUDO_DEBUG_EVENT)
base = ecalloc(1, sizeof(*base));
TAILQ_INIT(&base->events);
if (sudo_ev_base_alloc_impl(base) != 0) {
efree(base);
base = NULL;
@@ -110,9 +110,9 @@ sudo_ev_add(struct sudo_event_base *base, struct sudo_event *ev, bool tohead)
debug_return_int(-1);
ev->base = base;
if (tohead) {
tq_insert_head(base, ev);
TAILQ_INSERT_HEAD(&base->events, ev, entries);
} else {
tq_insert_tail(base, ev);
TAILQ_INSERT_TAIL(&base->events, ev, entries);
}
}
/* Clear pending delete so adding from callback works properly. */
@@ -149,17 +149,15 @@ sudo_ev_del(struct sudo_event_base *base, struct sudo_event *ev)
debug_return_int(-1);
/* Unlink from list. */
tq_remove(base, ev);
TAILQ_REMOVE(&base->events, ev, entries);
/* If we removed the pending event, replace it with the next one. */
if (base->pending == ev)
base->pending = ev->next;
base->pending = TAILQ_NEXT(ev, entries);
/* Mark event unused. */
ev->pfd_idx = -1;
ev->base = NULL;
ev->prev = NULL;
ev->next = NULL;
debug_return_int(0);
}