diff options
| author | Russ White <russ@riw.us> | 2017-04-19 07:04:04 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-19 07:04:04 -0400 |
| commit | ae731843400043a6a6540cc60c99bf5f9ab63ba7 (patch) | |
| tree | 45d474a6afcfbfaedf561d1897f30501d82ed7a1 | |
| parent | de72643d15dff0225e7d05b130dd34db9e7c08fb (diff) | |
| parent | 6cbc63316b75e72a04e57ffca146e81ee89d645c (diff) | |
Merge pull request #374 from qlyoung/pqueue-linear-remove
lib: add removal by item to pqueue
| -rw-r--r-- | lib/pqueue.c | 8 | ||||
| -rw-r--r-- | lib/pqueue.h | 1 |
2 files changed, 9 insertions, 0 deletions
diff --git a/lib/pqueue.c b/lib/pqueue.c index 0f870564da..fa502b462a 100644 --- a/lib/pqueue.c +++ b/lib/pqueue.c @@ -188,3 +188,11 @@ pqueue_remove_at (int index, struct pqueue *queue) trickle_down (index, queue); } } + +void +pqueue_remove (void *data, struct pqueue *queue) +{ + for (int i = 0; i < queue->size; i++) + if (queue->array[i] == data) + pqueue_remove_at (i, queue); +} diff --git a/lib/pqueue.h b/lib/pqueue.h index 8bb6961d86..b39fb92ee9 100644 --- a/lib/pqueue.h +++ b/lib/pqueue.h @@ -39,6 +39,7 @@ extern void pqueue_delete (struct pqueue *queue); extern void pqueue_enqueue (void *data, struct pqueue *queue); extern void *pqueue_dequeue (struct pqueue *queue); extern void pqueue_remove_at (int index, struct pqueue *queue); +extern void pqueue_remove (void *data, struct pqueue *queue); extern void trickle_down (int index, struct pqueue *queue); extern void trickle_up (int index, struct pqueue *queue); |
