fix -Wduplicate-decl-specifier warnings

include/iwinfo.h:209:19: warning: duplicate 'const' declaration specifier [-Wduplicate-decl-specifier]
  209 | static const char const *ht_secondary_offset[4] = {
      |                   ^~~~~

Constify and move the offenders out of the header.

Signed-off-by: Andre Heider <a.heider@gmail.com>

diff --git a/include/iwinfo.h b/include/iwinfo.h
index 576632d7cce2d5dbac1c7e9c0fdceab59e1318c3..f2d6d3593c2ca40f3fd27f7632d4e98e28349194 100644 (file)
--- a/include/iwinfo.h
+++ b/include/iwinfo.h
@@ -199,25 +199,15 @@ struct iwinfo_scanlist_vht_chan_entry {
        uint8_t center_chan_2;
 };
 
-static const char *ht_secondary_offset[4] = {
-       "no secondary",
-       "above",
-       "[reserved!]",
-       "below",
-};
-
-
-static uint16_t ht_chan_width[2] = {
-       20, /* 20 MHz */
-       2040, /* 40 MHz or higher (refer to vht if supported) */
-};
-
-static uint16_t vht_chan_width[] = {
-       [0] = 40, /* 40 MHz or lower (refer to ht to a more precise width) */
-       [1] = 80, /* 80 MHz */
-       [3] = 8080, /* 80+80 MHz */
-       [2] = 160, /* 160 MHz */
-};
+extern const char * const ht_secondary_offset[4];
+/* 0 = 20 MHz
+   1 = 40 MHz or higher (refer to vht if supported) */
+extern const uint16_t ht_chan_width[2];
+/* 0 = 40 MHz or lower (refer to ht to a more precise width)
+   1 = 80 MHz
+   2 = 160 MHz
+   3 = 80+80 MHz */
+extern const uint16_t vht_chan_width[4];
 
 struct iwinfo_scanlist_entry {
        uint8_t mac[6];

diff --git a/iwinfo_lib.c b/iwinfo_lib.c
index 22571f04ff6d341c80285c4247f0193e6720a24c..e91448498f3fbffc6819b469bb0677ca4a35a079 100644 (file)
--- a/iwinfo_lib.c
+++ b/iwinfo_lib.c
@@ -78,6 +78,24 @@ const char *IWINFO_HTMODE_NAMES[] = {
        "HE160"
 };
 
+const char * const ht_secondary_offset[4] = {
+       "no secondary",
+       "above",
+       "[reserved!]",
+       "below",
+};
+
+const uint16_t ht_chan_width[2] = {
+       20,
+       2040,
+};
+
+const uint16_t vht_chan_width[4] = {
+       40, /* 40 MHz or lower (refer to ht to a more precise width) */
+       80, /* 80 MHz */
+       160, /* 160 MHz */
+       8080, /* 80+80 MHz */
+};
 
 /*
  * ISO3166 country labels