shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-03-03 16:58:37 +03:00
Code

tree-wide: use SWAP_TWO a bit more

Browse Source
This commit is contained in:
Lennart Poettering 2018-11-26 19:10:26 +01:00
parent f5050e48ae
commit 020b39497a
3 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
coccinelle/swap-two.cocci Normal file
View File

@ -0,0 +1,7 @@
@@
expression x, y, z;
@@
- z = x;
- x = y;
- y = z;
+ SWAP_TWO(x, y);

11
src/basic/prioq.c
View File

@ -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;

6
src/shared/barrier.c
View File

@ -151,8 +151,6 @@ void barrier_destroy(Barrier *b) {
* this is currently not needed so it hasn't been implemented.
*/
void barrier_set_role(Barrier *b, unsigned role) {
int fd;
assert(b);
assert(IN_SET(role, BARRIER_PARENT, BARRIER_CHILD));
/* make sure this is only called once */
@ -164,9 +162,7 @@ void barrier_set_role(Barrier *b, unsigned role) {
b->pipe[0] = safe_close(b->pipe[0]);
/* swap me/them for children */
fd = b->me;
b->me = b->them;
b->them = fd;
SWAP_TWO(b->me, b->them);
}
}