From: "Luis R. Rodriguez" <mcgrof@xxxxxxxxxxxxxxxx> Signed-off-by: Luis R. Rodriguez <mcgrof at do-not-panic.com> --- intersect.c | 2 +- reglib.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/intersect.c b/intersect.c index 22b3225..bc1e63e 100644 --- a/intersect.c +++ b/intersect.c @@ -24,7 +24,7 @@ int main(int argc, char **argv) /* We intersect only when we have to rd structures ready */ reglib_for_each_country(rd, idx, argv[1]) { - if (is_world_regdom((const char *) rd->alpha2)) { + if (reglib_is_world_regdom((const char *) rd->alpha2)) { free((struct ieee80211_regdomain *) rd); continue; } diff --git a/reglib.h b/reglib.h index 4c0ec6d..98aadcc 100644 --- a/reglib.h +++ b/reglib.h @@ -31,7 +31,7 @@ struct ieee80211_regdomain { struct ieee80211_reg_rule reg_rules[]; }; -static inline int is_world_regdom(const char *alpha2) +static inline int reglib_is_world_regdom(const char *alpha2) { if (alpha2[0] == '0' && alpha2[1] == '0') return 1; @@ -54,7 +54,7 @@ static inline int is_alpha2(const char *alpha2) static inline int is_valid_regdom(const char *alpha2) { - if (!is_alpha2(alpha2) && !is_world_regdom(alpha2)) + if (!is_alpha2(alpha2) && !reglib_is_world_regdom(alpha2)) return 0; return 1; -- 1.7.10.4