crda: rename reglib_get_*() routines
reglib_get_country_idx() --> reglib_get_rd_alpha2()
reglib_get_country_alpha2() --> reglib_get_rd_alpha2()
This reflects better what we provide back out.
Signed-off-by: Luis R. Rodriguez <mcgrof@frijolero.org>
diff --git a/crda.c b/crda.c
index c6dc3d4..cdbc69a 100644
--- a/crda.c
+++ b/crda.c
@@ -191,7 +191,7 @@
close(fd);
- rd = reglib_get_country_alpha2(alpha2, *regdb);
+ rd = reglib_get_rd_alpha2(alpha2, *regdb);
if (!rd) {
fprintf(stderr, "No country match in regulatory database.\n");
return -1;
diff --git a/reglib.c b/reglib.c
index 12698fa..bc81974 100644
--- a/reglib.c
+++ b/reglib.c
@@ -226,7 +226,7 @@
}
struct ieee80211_regdomain *
-reglib_get_country_idx(unsigned int idx, const char *file)
+reglib_get_rd_idx(unsigned int idx, const char *file)
{
int fd;
struct stat stat;
@@ -288,7 +288,7 @@
}
struct ieee80211_regdomain *
-reglib_get_country_alpha2(const char *alpha2, const char *file)
+reglib_get_rd_alpha2(const char *alpha2, const char *file)
{
int fd;
struct stat stat;
diff --git a/reglib.h b/reglib.h
index 99e6c76..9b9bd5c 100644
--- a/reglib.h
+++ b/reglib.h
@@ -74,16 +74,16 @@
int crda_verify_db_signature(uint8_t *db, int dblen, int siglen);
struct ieee80211_regdomain *
-reglib_get_country_idx(unsigned int idx, const char *file);
+reglib_get_rd_idx(unsigned int idx, const char *file);
#define reglib_for_each_country(__rd, __idx, __file) \
- for (__rd = reglib_get_country_idx(__idx, __file); \
+ for (__rd = reglib_get_rd_idx(__idx, __file); \
__rd != NULL; \
- __rd = reglib_get_country_idx(__idx, __file), \
+ __rd = reglib_get_rd_idx(__idx, __file), \
__idx++)
struct ieee80211_regdomain *
-reglib_get_country_alpha2(const char *alpha2, const char *file);
+reglib_get_rd_alpha2(const char *alpha2, const char *file);
/* reg helpers */
void print_regdom(struct ieee80211_regdomain *rd);
