diff options
author | Luis R. Rodriguez <mcgrof@do-not-panic.com> | 2013-05-29 18:57:02 -0700 |
---|---|---|
committer | Luis R. Rodriguez <mcgrof@do-not-panic.com> | 2013-05-30 18:54:52 -0700 |
commit | ebe619ac4783d4a39e83e93ddbe54de0c40cda05 (patch) | |
tree | 21e910bb7b89d34c8e99eebd7acec29b2e74d4fb | |
parent | 70178f694bd4b322556f47acb2ffeba558dbf040 (diff) | |
download | crda-ebe619ac4783d4a39e83e93ddbe54de0c40cda05.tar.gz |
crda: rename regdom_intersect() to reglib_intersect_rds()
This fits more in line with the reglib prefix usage.
Signed-off-by: Luis R. Rodriguez <mcgrof@do-not-panic.com>
-rw-r--r-- | intersect.c | 2 | ||||
-rw-r--r-- | reglib.c | 8 | ||||
-rw-r--r-- | reglib.h | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/intersect.c b/intersect.c index bce7eb3..51479e4 100644 --- a/intersect.c +++ b/intersect.c @@ -39,7 +39,7 @@ int main(int argc, char **argv) prev_rd_intsct = (struct ieee80211_regdomain *) rd_intsct; } - rd_intsct = regdom_intersect(prev_rd_intsct, rd); + rd_intsct = reglib_intersect_rds(prev_rd_intsct, rd); if (!rd_intsct) { free(prev_rd_intsct); free((struct ieee80211_regdomain *) rd); @@ -417,7 +417,7 @@ static int is_valid_reg_rule(const struct ieee80211_reg_rule *rule) } /* - * Helper for regdom_intersect(), this does the real + * Helper for reglib_intersect_rds(), this does the real * mathematical intersection fun */ static int reg_rules_intersect(const struct ieee80211_reg_rule *rule1, @@ -463,7 +463,7 @@ static int reg_rules_intersect(const struct ieee80211_reg_rule *rule1, } /** - * regdom_intersect - do the intersection between two regulatory domains + * reglib_intersect_rds - do the intersection between two regulatory domains * @rd1: first regulatory domain * @rd2: second regulatory domain * @@ -476,8 +476,8 @@ static int reg_rules_intersect(const struct ieee80211_reg_rule *rule1, * malloc() this structure for you. */ struct ieee80211_regdomain * -regdom_intersect(const struct ieee80211_regdomain *rd1, - const struct ieee80211_regdomain *rd2) +reglib_intersect_rds(const struct ieee80211_regdomain *rd1, + const struct ieee80211_regdomain *rd2) { int r, size_of_regd; unsigned int x, y; @@ -87,7 +87,7 @@ reglib_get_rd_alpha2(const char *alpha2, const char *file); /* reg helpers */ void print_regdom(const struct ieee80211_regdomain *rd); struct ieee80211_regdomain * -regdom_intersect(const struct ieee80211_regdomain *rd1, - const struct ieee80211_regdomain *rd2); +reglib_intersect_rds(const struct ieee80211_regdomain *rd1, + const struct ieee80211_regdomain *rd2); #endif |