sandbox: queue: remove q_length field, add queue_empty()
This commit is contained in:
@@ -2,6 +2,18 @@
|
||||
#include <assert.h>
|
||||
#include <stdio.h>
|
||||
|
||||
size_t queue_length(queue_t *q)
|
||||
{
|
||||
size_t i = 0;
|
||||
queue_entry_t *x = q->q_first;
|
||||
while (x) {
|
||||
i++;
|
||||
x = x->qe_next;
|
||||
}
|
||||
|
||||
return i;
|
||||
}
|
||||
|
||||
void queue_insert_before(queue_t *q, queue_entry_t *entry, queue_entry_t *before)
|
||||
{
|
||||
queue_entry_t *x = before->qe_prev;
|
||||
@@ -30,7 +42,6 @@ void queue_insert_after(queue_t *q, queue_entry_t *entry, queue_entry_t *after)
|
||||
|
||||
after->qe_next = entry;
|
||||
entry->qe_prev = after;
|
||||
q->q_length++;
|
||||
}
|
||||
|
||||
void queue_push_front(queue_t *q, queue_entry_t *entry)
|
||||
@@ -47,8 +58,6 @@ void queue_push_front(queue_t *q, queue_entry_t *entry)
|
||||
if (!q->q_last) {
|
||||
q->q_last = entry;
|
||||
}
|
||||
|
||||
q->q_length++;
|
||||
}
|
||||
|
||||
void queue_push_back(queue_t *q, queue_entry_t *entry)
|
||||
@@ -65,8 +74,6 @@ void queue_push_back(queue_t *q, queue_entry_t *entry)
|
||||
if (!q->q_first) {
|
||||
q->q_first = entry;
|
||||
}
|
||||
|
||||
q->q_length++;
|
||||
}
|
||||
|
||||
queue_entry_t *queue_pop_front(queue_t *q)
|
||||
@@ -92,7 +99,6 @@ queue_entry_t *queue_pop_back(queue_t *q)
|
||||
void queue_delete(queue_t *q, queue_entry_t *entry)
|
||||
{
|
||||
if (!entry) {
|
||||
printf("null entry\n");
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -113,7 +119,6 @@ void queue_delete(queue_t *q, queue_entry_t *entry)
|
||||
}
|
||||
|
||||
entry->qe_next = entry->qe_prev = NULL;
|
||||
q->q_length--;
|
||||
}
|
||||
|
||||
void queue_delete_all(queue_t *q)
|
||||
@@ -126,5 +131,4 @@ void queue_delete_all(queue_t *q)
|
||||
}
|
||||
|
||||
q->q_first = q->q_last = NULL;
|
||||
q->q_length = 0;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user