From d698ca092600a27d66259ab2454d3b93b159e4b3 Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Mon, 7 Mar 2022 11:54:26 +0000 Subject: [PATCH] address: Rename in6_addr_get_bit/in6_addr_set_bit to loc_address_* Signed-off-by: Michael Tremer --- src/database.c | 6 +++--- src/libloc/address.h | 4 ++-- src/network.c | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/database.c b/src/database.c index 62d9a81..ff000a9 100644 --- a/src/database.c +++ b/src/database.c @@ -809,8 +809,8 @@ static int __loc_database_lookup(struct loc_database* db, const struct in6_addr* off_t node_index; // Follow the path - int bit = in6_addr_get_bit(address, level); - in6_addr_set_bit(network_address, level, bit); + int bit = loc_address_get_bit(address, level); + loc_address_set_bit(network_address, level, bit); if (bit == 0) node_index = be32toh(node->zero); @@ -1243,7 +1243,7 @@ static int __loc_database_enumerator_next_network( } // Mark the bits on the path correctly - in6_addr_set_bit(&enumerator->network_address, + loc_address_set_bit(&enumerator->network_address, (node->depth > 0) ? node->depth - 1 : 0, node->i); DEBUG(enumerator->ctx, "Looking at node %jd\n", (intmax_t)node->offset); diff --git a/src/libloc/address.h b/src/libloc/address.h index 86a8b61..f40a4f4 100644 --- a/src/libloc/address.h +++ b/src/libloc/address.h @@ -45,11 +45,11 @@ static inline int loc_address_cmp(const struct in6_addr* a1, const struct in6_ad return 0; } -static inline int in6_addr_get_bit(const struct in6_addr* address, unsigned int i) { +static inline int loc_address_get_bit(const struct in6_addr* address, unsigned int i) { return ((address->s6_addr[i / 8] >> (7 - (i % 8))) & 1); } -static inline void in6_addr_set_bit(struct in6_addr* address, unsigned int i, unsigned int val) { +static inline void loc_address_set_bit(struct in6_addr* address, unsigned int i, unsigned int val) { address->s6_addr[i / 8] ^= (-val ^ address->s6_addr[i / 8]) & (1 << (7 - (i % 8))); } diff --git a/src/network.c b/src/network.c index 551d697..5135f1c 100644 --- a/src/network.c +++ b/src/network.c @@ -782,7 +782,7 @@ static struct loc_network_tree_node* loc_network_tree_get_path(struct loc_networ for (unsigned int i = 0; i < prefix; i++) { // Check if the ith bit is one or zero - node = loc_network_tree_get_node(node, in6_addr_get_bit(address, i)); + node = loc_network_tree_get_node(node, loc_address_get_bit(address, i)); } return node; -- 2.39.2