summaryrefslogtreecommitdiff
path: root/support/dktools/dk3sto.ctr
diff options
context:
space:
mode:
authorNorbert Preining <norbert@preining.info>2020-09-20 03:03:26 +0000
committerNorbert Preining <norbert@preining.info>2020-09-20 03:03:26 +0000
commit1f457376b478257b88d4a857f5ec1b6155442dd7 (patch)
tree2a06a60551dea362cf8cb0cb0ba66c78608717c4 /support/dktools/dk3sto.ctr
parentac690ca29ad5bf8a5203a65fd6252f7b564f4727 (diff)
CTAN sync 202009200303
Diffstat (limited to 'support/dktools/dk3sto.ctr')
-rw-r--r--support/dktools/dk3sto.ctr31
1 files changed, 14 insertions, 17 deletions
diff --git a/support/dktools/dk3sto.ctr b/support/dktools/dk3sto.ctr
index 5c160687d3..d1d32b6078 100644
--- a/support/dktools/dk3sto.ctr
+++ b/support/dktools/dk3sto.ctr
@@ -2,7 +2,7 @@
copyright owner = Dirk Krause
copyright year = 2011-xxxx
-license = bsd
+SPDX-License-Identifier: BSD-3-Clause
@@ -668,6 +668,7 @@ dk3sto_left_deleted(dk3_sto_node_t *p, short *h)
$? "+ dk3sto_left_deleted %!8s %!8s", TR_8PTR(p), TR_8PTR(h)
switch(p->b) {
case 0: *h = - *h;
+ /* fall-through */
case 3:
$? ". going to increment balance field of %!8s", TR_8PTR(p)
dk3sto_inc_balance(p);
@@ -712,6 +713,7 @@ dk3sto_right_deleted(dk3_sto_node_t *p, short *h)
$? "+ dk3sto_right_deleted %!8s %!8s", TR_8PTR(p), TR_8PTR(h)
switch(p->b) {
case 0: *h = - *h;
+ /* fall-through */
case 1: dk3sto_dec_balance(p);
break;
case 3: {
@@ -1276,14 +1278,14 @@ dk3sto_list_find_like(
/** Find node for an object (exact search).
@param r Root node.
@param o Object.
- @param s Storage.
@return Pointer to the objects node or NULL.
*/
-static dk3_sto_node_t *
-dk3sto_list_find_exact(dk3_sto_node_t *r, void const *o, dk3_sto_t *s)
+static
+dk3_sto_node_t *
+dk3sto_list_find_exact(dk3_sto_node_t *r, void const *o)
{
dk3_sto_node_t *back;
- $? "+ sorted_find_exact %!8s %!8s %!8s", TR_8PTR(r), TR_8PTR(o), TR_8PTR(s)
+ $? "+ sorted_find_exact %!8s %!8s", TR_8PTR(r), TR_8PTR(o)
back = dk3sto_unsorted_find_exact(r,o);
$? "- sorted_find_exact %!8s", TR_8PTR(back)
return back;
@@ -1395,18 +1397,13 @@ dk3sto_list_find_last_node(dk3_sto_node_t *n)
/** Remove storage node from list storage.
@param ro Root node.
@param n Node to remove.
- @param st Storage.
- @param sci ???
- @param toremove ???
*/
-static dk3_sto_node_t *
-dk3sto_list_remove(
- dk3_sto_node_t *ro, dk3_sto_node_t *n, dk3_sto_t *st, int *sci,
- dk3_sto_node_t **toremove
-)
+static
+dk3_sto_node_t *
+dk3sto_list_remove( dk3_sto_node_t *ro, dk3_sto_node_t *n)
{
dk3_sto_node_t *back;
- $? "+ sorted_remove %!8s %!8s %!8s", TR_8PTR(ro), TR_8PTR(n), TR_8PTR(st)
+ $? "+ sorted_remove %!8s %!8s", TR_8PTR(ro), TR_8PTR(n)
back = dk3sto_unsorted_remove(ro,n);
$? "- sorted_remove %!8s", TR_8PTR(back)
return back;
@@ -1642,7 +1639,7 @@ dk3sto_remove(dk3_sto_t *st, void *o)
if(st->t) {
node_to_remove = dk3sto_tree_find_exact(st->r,o,st);
} else {
- node_to_remove = dk3sto_list_find_exact(st->r,o,st);
+ node_to_remove = dk3sto_list_find_exact(st->r,o);
}
} else {
node_to_remove = dk3sto_unsorted_find_exact(st->r,o);
@@ -1662,7 +1659,7 @@ dk3sto_remove(dk3_sto_t *st, void *o)
if(st->t) {
st->r = dk3sto_tree_remove(st->r,node_to_remove,st,&back,&node_to_remove);
} else {
- st->r = dk3sto_list_remove(st->r,node_to_remove,st,&back,&node_to_remove);
+ st->r = dk3sto_list_remove(st->r,node_to_remove);
}
} else {
st->r = dk3sto_unsorted_remove(st->r,node_to_remove);
@@ -1808,7 +1805,7 @@ dk3sto_it_find_exact(dk3_sto_it_t *i, void const *o)
if((i->s)->t) {
i->c = dk3sto_tree_find_exact((i->s)->r, o, i->s);
} else {
- i->c = dk3sto_list_find_exact((i->s)->r, o, i->s);
+ i->c = dk3sto_list_find_exact((i->s)->r, o);
}
} else {
i->c = dk3sto_unsorted_find_exact((i->s)->r, o);