network: Drop redundant loc_network_match_flag

There is loc_network_has_flag which does exactly the same

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/src/database.c b/src/database.c
index 5088e093071249be1ee6bda2199e028487b82c24..d37e70fb3bac6eb3a2f4cc9a2012c43b1db7cd2a 100644 (file)
--- 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 ee333f18f86c41cbb7b00693b6fa81c5ee9768d4..11f9d683860682a0307815e8871e0096cd1be31d 100644 (file)
--- 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 030d0369f2542ac6801ec3443cb9ee7f0a421ed7..218776e9eb06cd5b48da4bfa329ebc6d92733e88 100644 (file)
--- 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 7b1bc7cc9ec38e9e1354d8275ac3f6f259ee0ddd..0c824524942c66bbaf39d54b7692a62b0ea02d7a 100644 (file)
--- 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);