Fix -Wall -Wpedantic warnings

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>

6 files changed, 23 insertions, 36 deletions

diff --git a/include/iwinfo.h b/include/iwinfo.h
index 95020a4..a3380ca 100644
--- a/include/iwinfo.h
+++ b/include/iwinfo.h
@@ -121,7 +121,7 @@ struct iwinfo_crypto_entry {
 
 struct iwinfo_scanlist_entry {
 	uint8_t mac[6];
-	uint8_t ssid[IWINFO_ESSID_MAX_SIZE+1];
+	char ssid[IWINFO_ESSID_MAX_SIZE+1];
 	enum iwinfo_opmode mode;
 	uint8_t channel;
 	uint8_t signal;
@@ -132,12 +132,12 @@ struct iwinfo_scanlist_entry {
 
 struct iwinfo_country_entry {
 	uint16_t iso3166;
-	uint8_t ccode[4];
+	char ccode[4];
 };
 
 struct iwinfo_iso3166_label {
 	uint16_t iso3166;
-	uint8_t  name[28];
+	char name[28];
 };
 
 struct iwinfo_hardware_id {
diff --git a/iwinfo_cli.c b/iwinfo_cli.c
index ed6be54..7cb90c2 100644
--- a/iwinfo_cli.c
+++ b/iwinfo_cli.c
@@ -903,7 +903,6 @@ int main(int argc, char **argv)
 		}
 	}
 
-out:
 	iwinfo_finish();
 
 	return rv;
diff --git a/iwinfo_lua.c b/iwinfo_lua.c
index 21d6bbc..1a91001 100644
--- a/iwinfo_lua.c
+++ b/iwinfo_lua.c
@@ -597,7 +597,7 @@ static char * iwinfo_L_country_lookup(char *buf, int len, int iso3166)
 
 static int iwinfo_L_countrylist(lua_State *L, int (*func)(const char *, char *, int *))
 {
-	int len, i, j;
+	int len, i;
 	char rv[IWINFO_BUFSIZE], alpha2[3];
 	char *ccode;
 	const char *ifname = luaL_checkstring(L, 1);
@@ -608,7 +608,7 @@ static int iwinfo_L_countrylist(lua_State *L, int (*func)(const char *, char *,
 
 	if (!(*func)(ifname, rv, &len))
 	{
-		for (l = IWINFO_ISO3166_NAMES, j = 1; l->iso3166; l++)
+		for (l = IWINFO_ISO3166_NAMES, i = 1; l->iso3166; l++)
 		{
 			if ((ccode = iwinfo_L_country_lookup(rv, len, l->iso3166)) != NULL)
 			{
@@ -626,7 +626,7 @@ static int iwinfo_L_countrylist(lua_State *L, int (*func)(const char *, char *,
 				lua_pushstring(L, l->name);
 				lua_setfield(L, -2, "name");
 
-				lua_rawseti(L, -2, j++);
+				lua_rawseti(L, -2, i++);
 			}
 		}
 	}
diff --git a/iwinfo_nl80211.c b/iwinfo_nl80211.c
index 60537fc..900eef2 100644
--- a/iwinfo_nl80211.c
+++ b/iwinfo_nl80211.c
@@ -216,7 +216,6 @@ static struct nl80211_msg_conveyor * nl80211_new(struct genl_family *family,
 	return &cv;
 
 err:
-nla_put_failure:
 	if (cb)
 		nl_cb_put(cb);
 
@@ -268,7 +267,7 @@ static int nl80211_phy_idx_from_uci_macaddr(struct uci_section *s)
 	if (!opt)
 		return -1;
 
-	snprintf(buf, sizeof(buf), "/sys/class/ieee80211/*", opt);	/**/
+	snprintf(buf, sizeof(buf), "/sys/class/ieee80211/*");	/**/
 	if (glob(buf, 0, NULL, &gl))
 		return -1;
 
@@ -566,7 +565,7 @@ static char * nl80211_ifname2phy(const char *ifname)
 
 static char * nl80211_phy2ifname(const char *ifname)
 {
-	int fd, ifidx = -1, cifidx = -1, phyidx = -1;
+	int ifidx = -1, cifidx = -1, phyidx = -1;
 	char buffer[64];
 	static char nif[IFNAMSIZ] = { 0 };
 
@@ -892,10 +891,9 @@ static int __nl80211_wpactl_query(const char *ifname, ...)
 
 static char * nl80211_ifadd(const char *ifname)
 {
-	int phyidx;
 	char *rv = NULL, path[PATH_MAX];
 	static char nif[IFNAMSIZ] = { 0 };
-	struct nl80211_msg_conveyor *req, *res;
+	struct nl80211_msg_conveyor *req;
 	FILE *sysfs;
 
 	req = nl80211_msg(ifname, NL80211_CMD_NEW_INTERFACE, 0);
@@ -984,7 +982,7 @@ static int nl80211_get_ssid_bssid_cb(struct nl_msg *msg, void *arg)
 	struct nlattr *bss[NL80211_BSS_MAX + 1];
 
 	static struct nla_policy bss_policy[NL80211_BSS_MAX + 1] = {
-		[NL80211_BSS_INFORMATION_ELEMENTS] = {                 },
+		[NL80211_BSS_INFORMATION_ELEMENTS] = { 0 },
 		[NL80211_BSS_STATUS]               = { .type = NLA_U32 },
 	};
 
@@ -1043,7 +1041,7 @@ static int nl80211_get_ssid(const char *ifname, char *buf)
 	res = nl80211_phy2ifname(ifname);
 	req = nl80211_msg(res ? res : ifname, NL80211_CMD_GET_SCAN, NLM_F_DUMP);
 
-	sb.ssid = buf;
+	sb.ssid = (unsigned char *)buf;
 	*buf = 0;
 
 	if (req)
@@ -1944,15 +1942,15 @@ static int nl80211_get_scanlist_cb(struct nl_msg *msg, void *arg)
 	static struct nla_policy bss_policy[NL80211_BSS_MAX + 1] = {
 		[NL80211_BSS_TSF]                  = { .type = NLA_U64 },
 		[NL80211_BSS_FREQUENCY]            = { .type = NLA_U32 },
-		[NL80211_BSS_BSSID]                = {                 },
+		[NL80211_BSS_BSSID]                = { 0 },
 		[NL80211_BSS_BEACON_INTERVAL]      = { .type = NLA_U16 },
 		[NL80211_BSS_CAPABILITY]           = { .type = NLA_U16 },
-		[NL80211_BSS_INFORMATION_ELEMENTS] = {                 },
+		[NL80211_BSS_INFORMATION_ELEMENTS] = { 0 },
 		[NL80211_BSS_SIGNAL_MBM]           = { .type = NLA_U32 },
 		[NL80211_BSS_SIGNAL_UNSPEC]        = { .type = NLA_U8  },
 		[NL80211_BSS_STATUS]               = { .type = NLA_U32 },
 		[NL80211_BSS_SEEN_MS_AGO]          = { .type = NLA_U32 },
-		[NL80211_BSS_BEACON_IES]           = {                 },
+		[NL80211_BSS_BEACON_IES]           = { 0 },
 	};
 
 	if (!tb[NL80211_ATTR_BSS] ||
@@ -2073,7 +2071,7 @@ static int wpasupp_ssid_decode(const char *in, char *out, int outlen)
 				break;
 
 			case 'e':
-				out[len++] = '\e'; in++;
+				out[len++] = '\033'; in++;
 				break;
 
 			case 'x':
@@ -2333,15 +2331,6 @@ static int nl80211_get_freqlist_cb(struct nl_msg *msg, void *arg)
 	struct nlattr *freqs[NL80211_FREQUENCY_ATTR_MAX + 1];
 	struct nlattr *band, *freq;
 
-	static struct nla_policy freq_policy[NL80211_FREQUENCY_ATTR_MAX + 1] = {
-		[NL80211_FREQUENCY_ATTR_FREQ]         = { .type = NLA_U32  },
-		[NL80211_FREQUENCY_ATTR_DISABLED]     = { .type = NLA_FLAG },
-		[NL80211_FREQUENCY_ATTR_PASSIVE_SCAN] = { .type = NLA_FLAG },
-		[NL80211_FREQUENCY_ATTR_NO_IBSS]      = { .type = NLA_FLAG },
-		[NL80211_FREQUENCY_ATTR_RADAR]        = { .type = NLA_FLAG },
-		[NL80211_FREQUENCY_ATTR_MAX_TX_POWER] = { .type = NLA_U32  },
-	};
-
 	nla_for_each_nested(band, attr[NL80211_ATTR_WIPHY_BANDS], bands_remain)
 	{
 		nla_parse(bands, NL80211_BAND_ATTR_MAX,
@@ -2426,7 +2415,7 @@ static int nl80211_get_country(const char *ifname, char *buf)
 
 static int nl80211_get_countrylist(const char *ifname, char *buf, int *len)
 {
-	int i, count;
+	int count;
 	struct iwinfo_country_entry *e = (struct iwinfo_country_entry *)buf;
 	const struct iwinfo_iso3166_label *l;
 
@@ -2531,7 +2520,7 @@ static int nl80211_get_modelist_cb(struct nl_msg *msg, void *arg)
 static int nl80211_get_hwmodelist(const char *ifname, int *buf)
 {
 	struct nl80211_msg_conveyor *req;
-	struct nl80211_modes m = { };
+	struct nl80211_modes m = { 0 };
 
 	req = nl80211_msg(ifname, NL80211_CMD_GET_WIPHY, 0);
 	if (req)
@@ -2552,7 +2541,7 @@ static int nl80211_get_hwmodelist(const char *ifname, int *buf)
 static int nl80211_get_htmodelist(const char *ifname, int *buf)
 {
 	struct nl80211_msg_conveyor *req;
-	struct nl80211_modes m = { };
+	struct nl80211_modes m = { 0 };
 
 	req = nl80211_msg(ifname, NL80211_CMD_GET_WIPHY, 0);
 	if (req)
diff --git a/iwinfo_utils.c b/iwinfo_utils.c
index 9654207..f4b7b58 100644
--- a/iwinfo_utils.c
+++ b/iwinfo_utils.c
@@ -177,15 +177,16 @@ int iwinfo_hardware_id_from_mtd(struct iwinfo_hardware_id *id)
 	FILE *mtd;
 	uint16_t *bc;
 
-	int fd, len, off;
+	int fd;
+	unsigned int len, off;
 	char buf[128];
 
 	if (!(mtd = fopen("/proc/mtd", "r")))
 		return -1;
 
-	while (fgets(buf, sizeof(buf), mtd) > 0)
+	while (fgets(buf, sizeof(buf), mtd) != NULL)
 	{
-		if (fscanf(mtd, "mtd%d: %x %*x %127s", &off, &len, buf) < 3 ||
+		if (fscanf(mtd, "mtd%u: %x %*x %127s", &off, &len, buf) < 3 ||
 		    (strcmp(buf, "\"boardconfig\"") && strcmp(buf, "\"EEPROM\"") &&
 		     strcmp(buf, "\"factory\"")))
 		{
@@ -246,7 +247,7 @@ int iwinfo_hardware_id_from_mtd(struct iwinfo_hardware_id *id)
 				id->subsystem_vendor_id = 0x1814;
 
 				/* device */
-				if (bc[off] & 0xf0 == 0x30)
+				if ((bc[off] & 0xf0) == 0x30)
 					id->device_id = (bc[off] >> 8) | (bc[off] & 0x00ff) << 8;
 				else
 					id->device_id = bc[off];
diff --git a/iwinfo_wext.c b/iwinfo_wext.c
index 73ba650..ee02f3a 100644
--- a/iwinfo_wext.c
+++ b/iwinfo_wext.c
@@ -32,8 +32,6 @@ static double wext_freq2float(const struct iw_freq *in)
 
 static inline int wext_freq2mhz(const struct iw_freq *in)
 {
-	int i;
-
 	if( in->e == 6 )
 	{
 		return in->m;