From b2fcf7de246df9f76d2efa00ecbd007bc5926e61 Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Wed, 29 Sep 2021 18:21:31 +0000 Subject: [PATCH] network: Drop redundant loc_network_match_flag There is loc_network_has_flag which does exactly the same Signed-off-by: Michael Tremer --- src/database.c | 2 +- src/libloc.sym | 1 - src/libloc/network.h | 1 - src/network.c | 4 ---- 4 files changed, 1 insertion(+), 7 deletions(-) diff --git a/src/database.c b/src/database.c index 5088e09..d37e70f 100644 --- a/src/database.c +++ b/src/database.c @@ -1189,7 +1189,7 @@ static int loc_database_enumerator_filter_network( } // Skip if flags do not match - if (enumerator->flags && !loc_network_match_flag(network, enumerator->flags)) { + if (enumerator->flags && !loc_network_has_flag(network, enumerator->flags)) { DEBUG(enumerator->ctx, "Filtered network %p because of flags not matching\n", network); return 1; } diff --git a/src/libloc.sym b/src/libloc.sym index ee333f1..11f9d68 100644 --- a/src/libloc.sym +++ b/src/libloc.sym @@ -120,7 +120,6 @@ global: loc_network_match_address; loc_network_match_asn; loc_network_match_country_code; - loc_network_match_flag; loc_network_new; loc_network_new_from_string; loc_network_overlaps; diff --git a/src/libloc/network.h b/src/libloc/network.h index 030d036..218776e 100644 --- a/src/libloc/network.h +++ b/src/libloc/network.h @@ -57,7 +57,6 @@ int loc_network_match_asn(struct loc_network* network, uint32_t asn); int loc_network_has_flag(struct loc_network* network, uint32_t flag); int loc_network_set_flag(struct loc_network* network, uint32_t flag); -int loc_network_match_flag(struct loc_network* network, uint32_t flag); int loc_network_cmp(struct loc_network* self, struct loc_network* other); int loc_network_overlaps(struct loc_network* self, struct loc_network* other); diff --git a/src/network.c b/src/network.c index 7b1bc7c..0c82452 100644 --- a/src/network.c +++ b/src/network.c @@ -419,10 +419,6 @@ LOC_EXPORT int loc_network_set_flag(struct loc_network* network, uint32_t flag) return 0; } -LOC_EXPORT int loc_network_match_flag(struct loc_network* network, uint32_t flag) { - return loc_network_has_flag(network, flag); -} - LOC_EXPORT int loc_network_cmp(struct loc_network* self, struct loc_network* other) { // Compare address int r = in6_addr_cmp(&self->first_address, &other->first_address); -- 2.39.2