From 81bd709accf16cddbe998de614338453f55e4135 Mon Sep 17 00:00:00 2001 From: Philipp Schafft Date: Wed, 30 Sep 2020 19:22:36 +0000 Subject: [PATCH] Fix: Corrected node vs. client --- src/source.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/source.c b/src/source.c index 8cf771b4..dd9684fc 100644 --- a/src/source.c +++ b/src/source.c @@ -343,9 +343,7 @@ client_t *source_find_client(source_t *source, connection_id_t id) return NULL; } -static inline void source_move_clients__single(source_t *source, avl_tree *from, avl_tree *to, avl_node *node) { - client_t *client = (client_t*)node->key; - +static inline void source_move_clients__single(source_t *source, avl_tree *from, avl_tree *to, client_t *client) { avl_delete(from, client, NULL); /* when switching a client to a different queue, be wary of the @@ -422,7 +420,7 @@ void source_move_clients(source_t *source, source_t *dest, connection_id_t *id) avl_node *node = avl_get_first(source->pending_tree); if (node == NULL) break; - source_move_clients__single(source, source->pending_tree, dest->pending_tree, node); + source_move_clients__single(source, source->pending_tree, dest->pending_tree, node->key); count++; } @@ -430,7 +428,7 @@ void source_move_clients(source_t *source, source_t *dest, connection_id_t *id) avl_node *node = avl_get_first(source->client_tree); if (node == NULL) break; - source_move_clients__single(source, source->client_tree, dest->pending_tree, node); + source_move_clients__single(source, source->client_tree, dest->pending_tree, node->key); count++; } }