From 7933f5bfb4dd7603cb646e192840762bf6394292 Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Fri, 13 Nov 2020 11:43:53 +0000 Subject: [PATCH] network: Unexport all tree functions These should not be exported Signed-off-by: Michael Tremer --- src/network.c | 28 ++++++++++++++-------------- src/test-network.c | 9 +++++++++ 2 files changed, 23 insertions(+), 14 deletions(-) diff --git a/src/network.c b/src/network.c index e7dc97e..d015579 100644 --- a/src/network.c +++ b/src/network.c @@ -847,7 +847,7 @@ struct loc_network_tree_node { struct loc_network* network; }; -LOC_EXPORT int loc_network_tree_new(struct loc_ctx* ctx, struct loc_network_tree** tree) { +int loc_network_tree_new(struct loc_ctx* ctx, struct loc_network_tree** tree) { struct loc_network_tree* t = calloc(1, sizeof(*t)); if (!t) return -ENOMEM; @@ -867,7 +867,7 @@ LOC_EXPORT int loc_network_tree_new(struct loc_ctx* ctx, struct loc_network_tree return 0; } -LOC_EXPORT struct loc_network_tree_node* loc_network_tree_get_root(struct loc_network_tree* tree) { +struct loc_network_tree_node* loc_network_tree_get_root(struct loc_network_tree* tree) { return loc_network_tree_node_ref(tree->root); } @@ -939,7 +939,7 @@ static int __loc_network_tree_walk(struct loc_ctx* ctx, struct loc_network_tree_ return 0; } -LOC_EXPORT int loc_network_tree_walk(struct loc_network_tree* tree, +int loc_network_tree_walk(struct loc_network_tree* tree, int(*filter_callback)(struct loc_network* network, void* data), int(*callback)(struct loc_network* network, void* data), void* data) { return __loc_network_tree_walk(tree->ctx, tree->root, filter_callback, callback, data); @@ -954,7 +954,7 @@ static void loc_network_tree_free(struct loc_network_tree* tree) { free(tree); } -LOC_EXPORT struct loc_network_tree* loc_network_tree_unref(struct loc_network_tree* tree) { +struct loc_network_tree* loc_network_tree_unref(struct loc_network_tree* tree) { if (--tree->refcount > 0) return tree; @@ -975,13 +975,13 @@ static int __loc_network_tree_dump(struct loc_network* network, void* data) { return 0; } -LOC_EXPORT int loc_network_tree_dump(struct loc_network_tree* tree) { +int loc_network_tree_dump(struct loc_network_tree* tree) { DEBUG(tree->ctx, "Dumping network tree at %p\n", tree); return loc_network_tree_walk(tree, NULL, __loc_network_tree_dump, NULL); } -LOC_EXPORT int loc_network_tree_add_network(struct loc_network_tree* tree, struct loc_network* network) { +int loc_network_tree_add_network(struct loc_network_tree* tree, struct loc_network* network) { DEBUG(tree->ctx, "Adding network %p to tree %p\n", network, tree); struct loc_network_tree_node* node = loc_network_tree_get_path(tree, @@ -1012,7 +1012,7 @@ static int __loc_network_tree_count(struct loc_network* network, void* data) { return 0; } -LOC_EXPORT size_t loc_network_tree_count_networks(struct loc_network_tree* tree) { +size_t loc_network_tree_count_networks(struct loc_network_tree* tree) { size_t counter = 0; int r = loc_network_tree_walk(tree, NULL, __loc_network_tree_count, &counter); @@ -1034,11 +1034,11 @@ static size_t __loc_network_tree_count_nodes(struct loc_network_tree_node* node) return counter; } -LOC_EXPORT size_t loc_network_tree_count_nodes(struct loc_network_tree* tree) { +size_t loc_network_tree_count_nodes(struct loc_network_tree* tree) { return __loc_network_tree_count_nodes(tree->root); } -LOC_EXPORT int loc_network_tree_node_new(struct loc_ctx* ctx, struct loc_network_tree_node** node) { +int loc_network_tree_node_new(struct loc_ctx* ctx, struct loc_network_tree_node** node) { struct loc_network_tree_node* n = calloc(1, sizeof(*n)); if (!n) return -ENOMEM; @@ -1053,7 +1053,7 @@ LOC_EXPORT int loc_network_tree_node_new(struct loc_ctx* ctx, struct loc_network return 0; } -LOC_EXPORT struct loc_network_tree_node* loc_network_tree_node_ref(struct loc_network_tree_node* node) { +struct loc_network_tree_node* loc_network_tree_node_ref(struct loc_network_tree_node* node) { if (node) node->refcount++; @@ -1076,7 +1076,7 @@ static void loc_network_tree_node_free(struct loc_network_tree_node* node) { free(node); } -LOC_EXPORT struct loc_network_tree_node* loc_network_tree_node_unref(struct loc_network_tree_node* node) { +struct loc_network_tree_node* loc_network_tree_node_unref(struct loc_network_tree_node* node) { if (!node) return NULL; @@ -1087,7 +1087,7 @@ LOC_EXPORT struct loc_network_tree_node* loc_network_tree_node_unref(struct loc_ return NULL; } -LOC_EXPORT struct loc_network_tree_node* loc_network_tree_node_get(struct loc_network_tree_node* node, unsigned int index) { +struct loc_network_tree_node* loc_network_tree_node_get(struct loc_network_tree_node* node, unsigned int index) { if (index == 0) node = node->zero; else @@ -1099,11 +1099,11 @@ LOC_EXPORT struct loc_network_tree_node* loc_network_tree_node_get(struct loc_ne return loc_network_tree_node_ref(node); } -LOC_EXPORT int loc_network_tree_node_is_leaf(struct loc_network_tree_node* node) { +int loc_network_tree_node_is_leaf(struct loc_network_tree_node* node) { return (!!node->network); } -LOC_EXPORT struct loc_network* loc_network_tree_node_get_network(struct loc_network_tree_node* node) { +struct loc_network* loc_network_tree_node_get_network(struct loc_network_tree_node* node) { return loc_network_ref(node->network); } diff --git a/src/test-network.c b/src/test-network.c index af1b2e6..7c90224 100644 --- a/src/test-network.c +++ b/src/test-network.c @@ -37,12 +37,14 @@ int main(int argc, char** argv) { // Enable debug logging loc_set_log_priority(ctx, LOG_DEBUG); +#if 0 struct loc_network_tree* tree; err = loc_network_tree_new(ctx, &tree); if (err) { fprintf(stderr, "Could not create the network tree\n"); exit(EXIT_FAILURE); } +#endif // Create a network struct loc_network* network1; @@ -58,12 +60,14 @@ int main(int argc, char** argv) { exit(EXIT_FAILURE); } +#if 0 // Adding network to the tree err = loc_network_tree_add_network(tree, network1); if (err) { fprintf(stderr, "Could not add network to the tree\n"); exit(EXIT_FAILURE); } +#endif // Check if the first and last addresses are correct char* string = loc_network_format_first_address(network1); @@ -101,6 +105,7 @@ int main(int argc, char** argv) { exit(EXIT_FAILURE); } +#if 0 // Adding network to the tree err = loc_network_tree_add_network(tree, network2); if (err) { @@ -117,6 +122,7 @@ int main(int argc, char** argv) { size_t nodes = loc_network_tree_count_nodes(tree); printf("The tree has %zu nodes\n", nodes); +#endif // Check equals function err = loc_network_eq(network1, network1); @@ -260,7 +266,10 @@ int main(int argc, char** argv) { loc_network_unref(network2); loc_network_unref(network3); loc_network_unref(network4); + +#if 0 loc_network_tree_unref(tree); +#endif // And open it again from disk struct loc_database* db; -- 2.39.2