sandbox: queue: remove q_length field, add queue_empty()

This commit is contained in:
2023-02-02 21:00:23 +00:00
parent 662be5ec1f
commit 7d3000e84d
2 changed files with 17 additions and 11 deletions

View File

@@ -2,10 +2,11 @@
#define SOCKS_QUEUE_H_
#include <string.h>
#include <stdbool.h>
#define QUEUE_CONTAINER(t, m, v) ((void *)((v) ? (uintptr_t)(v) - (offsetof(t, m)) : 0))
#define QUEUE_INIT ((queue_t){ .q_first = NULL, .q_last = NULL, .q_length = 0 })
#define QUEUE_INIT ((queue_t){ .q_first = NULL, .q_last = NULL })
#define QUEUE_ENTRY_INIT ((queue_entry_t){ .qe_next = NULL, .qe_prev = NULL })
#define queue_foreach(iter_type, iter_name, queue_name, node_member) \
@@ -26,17 +27,18 @@ typedef struct queue_entry {
typedef struct queue {
queue_entry_t *q_first;
queue_entry_t *q_last;
unsigned int q_length;
} queue_t;
static inline void queue_init(queue_t *q) { memset(q, 0x00, sizeof *q); }
static inline unsigned int queue_length(queue_t *q) { return q->q_length; }
static inline bool queue_empty(queue_t *q) { return q->q_first == NULL; }
static inline queue_entry_t *queue_first(queue_t *q) { return q->q_first; }
static inline queue_entry_t *queue_last(queue_t *q) { return q->q_last; }
static inline queue_entry_t *queue_next(queue_entry_t *entry) { return entry->qe_next; }
static inline queue_entry_t *queue_prev(queue_entry_t *entry) { return entry->qe_prev; }
extern size_t queue_length(queue_t *q);
extern void queue_insert_before(queue_t *q, queue_entry_t *entry, queue_entry_t *before);
extern void queue_insert_after(queue_t *q, queue_entry_t *entry, queue_entry_t *after);