From 53440653f20d91a136d5ac3cfd207dd57c44b4f1 Mon Sep 17 00:00:00 2001 From: Max Wash Date: Sun, 9 Jul 2023 21:57:04 +0100 Subject: [PATCH] kernel: remove static qualifier from functions generated by btree convenience macros --- include/socks/btree.h | 44 +++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/include/socks/btree.h b/include/socks/btree.h index 2593074..55e00bf 100644 --- a/include/socks/btree.h +++ b/include/socks/btree.h @@ -63,7 +63,7 @@ extern "C" { @param function_name the name of the function to generate. */ #define BTREE_DEFINE_SIMPLE_INSERT(node_type, container_node_member, container_key_member, function_name) \ - static void function_name(struct btree *tree, node_type *node) \ + void function_name(struct btree *tree, node_type *node) \ { \ if (!tree->b_root) { \ tree->b_root = &node->container_node_member; \ @@ -71,10 +71,10 @@ extern "C" { return; \ } \ \ - struct btree_node *cur = tree->b_root; \ + struct btree_node *cur = tree->b_root; \ while (1) { \ node_type *cur_node = BTREE_CONTAINER(node_type, container_node_member, cur); \ - struct btree_node *next = NULL; \ + struct btree_node *next = NULL; \ \ if (node->container_key_member > cur_node->container_key_member) { \ next = btree_right(cur); \ @@ -138,7 +138,7 @@ extern "C" { requirements listed above. */ #define BTREE_DEFINE_INSERT(node_type, container_node_member, container_key_member, function_name, comparator) \ - static void function_name(struct btree *tree, node_type *node) \ + void function_name(struct btree *tree, node_type *node) \ { \ if (!tree->b_root) { \ tree->b_root = &node->container_node_member; \ @@ -146,10 +146,10 @@ extern "C" { return; \ } \ \ - struct btree_node *cur = tree->b_root; \ + struct btree_node *cur = tree->b_root; \ while (1) { \ node_type *cur_node = BTREE_CONTAINER(node_type, container_node_member, cur); \ - struct btree_node *next = NULL; \ + struct btree_node *next = NULL; \ int cmp = comparator(node, cur_node); \ \ if (cmp == 1) { \ @@ -203,22 +203,22 @@ extern "C" { @param function_name the name of the function to generate. */ #define BTREE_DEFINE_SIMPLE_GET(node_type, key_type, container_node_member, container_key_member, function_name) \ -node_type *function_name(struct btree *tree, key_type key) \ -{ \ - struct btree_node *cur = tree->b_root; \ - while (cur) { \ - node_type *cur_node = BTREE_CONTAINER(node_type, container_node_member, cur); \ - if (key > cur_node->container_key_member) { \ - cur = btree_right(cur); \ - } else if (key < cur_node->container_key_member) { \ - cur = btree_left(cur); \ - } else { \ - return cur_node; \ - } \ - } \ - \ - return NULL; \ -} + node_type *function_name(struct btree *tree, key_type key) \ + { \ + struct btree_node *cur = tree->b_root; \ + while (cur) { \ + node_type *cur_node = BTREE_CONTAINER(node_type, container_node_member, cur); \ + if (key > cur_node->container_key_member) { \ + cur = btree_right(cur); \ + } else if (key < cur_node->container_key_member) { \ + cur = btree_left(cur); \ + } else { \ + return cur_node; \ + } \ + } \ + \ + return NULL; \ + } /* perform an in-order traversal of a binary tree