From 02522106aa66d705e1f2ce4b17bccbc30fa34e45 Mon Sep 17 00:00:00 2001 From: Igor Putovny Date: Thu, 20 Feb 2025 14:31:32 +0100 Subject: [PATCH] memset removed nodes, add const and inline --- proto/aggregator/aggregator.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/proto/aggregator/aggregator.c b/proto/aggregator/aggregator.c index 9010acd53..20fdb0e4d 100644 --- a/proto/aggregator/aggregator.c +++ b/proto/aggregator/aggregator.c @@ -140,8 +140,7 @@ remove_node(struct trie_node *node) bug("Corrupted memory (node is not its parent's child)"); } - node->parent = NULL; - memset(node, 0xfe, sizeof(*node)); + memset(node, 0, sizeof(*node)); } /* @@ -162,7 +161,7 @@ node_add_potential_bucket(struct trie_node *node, const struct aggregator_bucket /* * Check if @bucket is one of potential buckets of @node */ -static int +static inline int node_is_bucket_potential(const struct trie_node *node, const struct aggregator_bucket *bucket) { assert(node != NULL); @@ -1047,7 +1046,7 @@ aggregator_update_prefix(struct aggregator_proto *p, struct aggregator_route *ol const ip_addr prefix = net_prefix(addr); const u32 pxlen = net_pxlen(addr); - struct trie_node *updated_node = aggregator_insert_prefix(p, prefix, pxlen, new->bucket); + struct trie_node * const updated_node = aggregator_insert_prefix(p, prefix, pxlen, new->bucket); assert(updated_node != NULL); assert(updated_node->original_bucket != NULL); assert(updated_node->status == NON_FIB); @@ -1089,7 +1088,7 @@ aggregator_withdraw_prefix(struct aggregator_proto *p, struct aggregator_route * const ip_addr prefix = net_prefix(addr); const u32 pxlen = net_pxlen(addr); - struct trie_node *updated_node = aggregator_remove_prefix(p, prefix, pxlen); + struct trie_node * const updated_node = aggregator_remove_prefix(p, prefix, pxlen); assert(updated_node != NULL); struct trie_node *node = updated_node; -- 2.47.2