summaryrefslogtreecommitdiff
path: root/prio-queue.c
diff options
context:
space:
mode:
authorÆvar Arnfjörð Bjarmason <avarab@gmail.com>2017-06-15 23:15:49 +0000
committerJunio C Hamano <gitster@pobox.com>2017-06-16 12:44:09 -0700
commit88ce3ef636b1385e861ec0e9e2155248b999b032 (patch)
tree0da315e544f734755c717c04852b2c44ac3345d3 /prio-queue.c
parente140f7afddcdce2bae062ea1578eac38c744e3a5 (diff)
downloadgit-88ce3ef636b1385e861ec0e9e2155248b999b032.tar.gz
*.[ch] refactoring: make use of the FREE_AND_NULL() macro
Replace occurrences of `free(ptr); ptr = NULL` which weren't caught by the coccinelle rule. These fall into two categories: - free/NULL assignments one after the other which coccinelle all put on one line, which is functionally equivalent code, but very ugly. - manually spotted occurrences where the NULL assignment isn't right after the free() call. Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'prio-queue.c')
-rw-r--r--prio-queue.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/prio-queue.c b/prio-queue.c
index fc3860fdcb..126d096727 100644
--- a/prio-queue.c
+++ b/prio-queue.c
@@ -27,10 +27,9 @@ void prio_queue_reverse(struct prio_queue *queue)
void clear_prio_queue(struct prio_queue *queue)
{
- free(queue->array);
+ FREE_AND_NULL(queue->array);
queue->nr = 0;
queue->alloc = 0;
- queue->array = NULL;
queue->insertion_ctr = 0;
}