From: Michael Tremer Date: Tue, 24 Nov 2020 15:50:39 +0000 (+0000) Subject: Drop loc_network_gt which is now unused X-Git-Tag: 0.9.5~28 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=61a6f6e4bf4493236d796e94f3d721bcf5ba68aa;p=people%2Fms%2Flibloc.git Drop loc_network_gt which is now unused Signed-off-by: Michael Tremer --- diff --git a/src/libloc.sym b/src/libloc.sym index d8e8f14..cb5e8ef 100644 --- a/src/libloc.sym +++ b/src/libloc.sym @@ -115,7 +115,6 @@ global: loc_network_get_country_code; loc_network_get_first_address; loc_network_get_last_address; - loc_network_gt; loc_network_has_flag; loc_network_is_subnet; loc_network_match_asn; diff --git a/src/loc/network.h b/src/loc/network.h index d5d0ccd..af3dafd 100644 --- a/src/loc/network.h +++ b/src/loc/network.h @@ -59,7 +59,6 @@ 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_gt(struct loc_network* self, struct loc_network* other); int loc_network_overlaps(struct loc_network* self, struct loc_network* other); int loc_network_is_subnet(struct loc_network* self, struct loc_network* other); int loc_network_subnets(struct loc_network* network, struct loc_network** subnet1, struct loc_network** subnet2); diff --git a/src/network.c b/src/network.c index 503bf3d..ac478d5 100644 --- a/src/network.c +++ b/src/network.c @@ -463,33 +463,6 @@ LOC_EXPORT int loc_network_cmp(struct loc_network* self, struct loc_network* oth return 0; } -LOC_EXPORT int loc_network_gt(struct loc_network* self, struct loc_network* other) { - // Families must match - if (self->family != other->family) - return -1; - - int r = in6_addr_cmp(&self->first_address, &other->first_address); - - switch (r) { - // Smaller - case -1: - return 0; - - // Larger - case 1: - return 1; - - default: - break; - } - - if (self->prefix > other->prefix) - return 1; - - // Dunno - return 0; -} - LOC_EXPORT int loc_network_overlaps(struct loc_network* self, struct loc_network* other) { if (loc_network_match_address(self, &other->first_address) == 0) return 1;