diff --git a/core/include/queue.h b/core/include/queue.h index 66f2d7ac36..690537e787 100644 --- a/core/include/queue.h +++ b/core/include/queue.h @@ -36,23 +36,6 @@ typedef struct queue_node_t { */ #define QUEUE_NODE_INIT { NULL, 0, 0 } -/** - * @brief attach `new_obj` to the tail of the queue (identified - * `root`) - * - * @param[in,out] root the queue's root - * @param[in] new_obj the object to append - */ -void queue_add_tail(queue_node_t *root, queue_node_t *new_obj); - -/** - * @brief attach `new_obj` to `root` at the beginning - * - * @param[in,out] root the queue's root - * @param[in] new_obj the object to prepend - */ -void queue_add_head(queue_node_t *root, queue_node_t *new_obj); - /** * @brief remove the queue's head * @@ -73,18 +56,6 @@ queue_node_t *queue_remove_head(queue_node_t *root); */ void queue_priority_add(queue_node_t *root, queue_node_t *new_obj); -/** - * @brief insert `new_obj` into `root` based on an arbitrary priority - * - * @details - * The new object will be appended after objects with the same priority. - * - * @param[in,out] root the queue's root - * @param[in] new_obj the object to prepend - * @param[in] cmp a comparator function used to determine the priority - */ -void queue_priority_add_generic(queue_node_t *root, queue_node_t *new_obj, int(*cmp)(queue_node_t *, queue_node_t *)) ; - /** * @brief remove `node` from `root` * diff --git a/core/queue.c b/core/queue.c index 4f99516313..bfa489a18d 100644 --- a/core/queue.c +++ b/core/queue.c @@ -46,22 +46,6 @@ queue_node_t *queue_remove_head(queue_node_t *root) return head; } -void queue_add_tail(queue_node_t *node, queue_node_t *new_obj) -{ - while (node->next != NULL) { - node = node->next; - } - - node->next = new_obj; - new_obj->next = NULL; -} - -void queue_add_head(queue_node_t *root, queue_node_t *new_obj) -{ - new_obj->next = root->next; - root->next = new_obj; -} - void queue_priority_add(queue_node_t *root, queue_node_t *new_obj) { queue_node_t *node = root; @@ -80,24 +64,6 @@ void queue_priority_add(queue_node_t *root, queue_node_t *new_obj) new_obj->next = NULL; } -void queue_priority_add_generic(queue_node_t *root, queue_node_t *new_obj, int (*cmp)(queue_node_t *, queue_node_t *)) -{ - queue_node_t *node = root; - - while (node->next != NULL) { - if (cmp(node->next, new_obj) < 0) { - new_obj->next = node->next; - node->next = new_obj; - return; - } - - node = node->next; - } - - node->next = new_obj; - new_obj->next = NULL; -} - #if ENABLE_DEBUG void queue_print(queue_node_t *node) {