diff options
| author | Tyge Løvset <[email protected]> | 2022-10-31 12:07:38 +0100 |
|---|---|---|
| committer | Tyge Løvset <[email protected]> | 2022-10-31 12:07:38 +0100 |
| commit | e448b1b20ec3903918fa38a0528c07159141cca6 (patch) | |
| tree | 3bb2946f1a55125b9197033716d3034dc0f63f27 /include/stc/clist.h | |
| parent | 7c9c39664ab563ed389e6f4f043efe3bd882bd7e (diff) | |
| download | STC-modified-e448b1b20ec3903918fa38a0528c07159141cca6.tar.gz STC-modified-e448b1b20ec3903918fa38a0528c07159141cca6.zip | |
Minor internal refactoring.
Diffstat (limited to 'include/stc/clist.h')
| -rw-r--r-- | include/stc/clist.h | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/include/stc/clist.h b/include/stc/clist.h index 019698ed..79ff789e 100644 --- a/include/stc/clist.h +++ b/include/stc/clist.h @@ -350,22 +350,21 @@ _cx_memb(_erase_node_after)(_cx_self* self, _cx_node* ref) { STC_DEF _cx_node* _cx_memb(_unlink_node_after)(_cx_self* self, _cx_node* ref) { - _cx_node* del = ref->next, *next = del->next; + _cx_node* node = ref->next, *next = node->next; ref->next = next; - if (del == next) + if (node == next) self->last = NULL; - else if (del == self->last) + else if (node == self->last) self->last = ref; - return del; + return node; } STC_DEF void _cx_memb(_reverse)(_cx_self* self) { - _cx_node *del; - _cx_self rev = _cx_memb(_init)(); + _cx_self rev = {NULL}; while (self->last) { - del = _cx_memb(_unlink_node_after)(self, self->last); - _cx_memb(_insert_node_after)(&rev, rev.last, del); + _cx_node* node = _cx_memb(_unlink_node_after)(self, self->last); + _cx_memb(_insert_node_after)(&rev, rev.last, node); } *self = rev; } @@ -381,22 +380,23 @@ _cx_memb(_splice)(_cx_self* self, _cx_iter it, _cx_self* other) { it.prev->next = next; if (!it.ref) self->last = it.prev; } - other->last = NULL; return it; + other->last = NULL; + return it; } STC_DEF _cx_self _cx_memb(_split_off)(_cx_self* self, _cx_iter it1, _cx_iter it2) { - _cx_self cx = {NULL}; + _cx_self lst = {NULL}; if (it1.ref == it2.ref) - return cx; + return lst; _cx_node *p1 = it1.prev, *p2 = it2.ref ? it2.prev : self->last; p1->next = p2->next; p2->next = _clist_tonode(it1.ref); if (self->last == p2) self->last = (p1 == p2) ? NULL : p1; - cx.last = p2; - return cx; + lst.last = p2; + return lst; } #if !defined _i_no_cmp |
