X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=src%2Fbasic%2Fprioq.c;fp=src%2Fbasic%2Fprioq.c;h=cfd08d5d23223ac4164e2a19c42914c660cb28e9;hb=020b39497a2a9f6699e984aa473753486d76e01d;hp=4ef4eaf0cdebb14fcf0d62fd7630aba92e8cbe51;hpb=f5050e48aee0de888cdea68580e577325ed0d1f8;p=thirdparty%2Fsystemd.git diff --git a/src/basic/prioq.c b/src/basic/prioq.c index 4ef4eaf0cde..cfd08d5d232 100644 --- a/src/basic/prioq.c +++ b/src/basic/prioq.c @@ -65,9 +65,6 @@ int prioq_ensure_allocated(Prioq **q, compare_func_t compare_func) { } static void swap(Prioq *q, unsigned j, unsigned k) { - void *saved_data; - unsigned *saved_idx; - assert(q); assert(j < q->n_items); assert(k < q->n_items); @@ -75,12 +72,8 @@ static void swap(Prioq *q, unsigned j, unsigned k) { assert(!q->items[j].idx || *(q->items[j].idx) == j); assert(!q->items[k].idx || *(q->items[k].idx) == k); - saved_data = q->items[j].data; - saved_idx = q->items[j].idx; - q->items[j].data = q->items[k].data; - q->items[j].idx = q->items[k].idx; - q->items[k].data = saved_data; - q->items[k].idx = saved_idx; + SWAP_TWO(q->items[j].data, q->items[k].data); + SWAP_TWO(q->items[j].idx, q->items[k].idx); if (q->items[j].idx) *q->items[j].idx = j;