You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by ag...@apache.org on 2020/02/26 15:16:14 UTC
[incubator-nuttx-apps] 01/03: net/wapi: remove unnecessary cast
This is an automated email from the ASF dual-hosted git repository.
aguettouche pushed a commit to branch pr98
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx-apps.git
commit 0351dea6eb63148cb71c66d4e2389d1096a7763a
Author: chao.an <an...@xiaomi.com>
AuthorDate: Wed Feb 19 20:50:02 2020 +0800
net/wapi: remove unnecessary cast
Change-Id: I4f7e9a8e4b4f38f08bd0a1ede1994e24f80bf89b
Signed-off-by: chao.an <an...@xiaomi.com>
---
include/wireless/wapi.h | 6 +++---
netutils/netinit/netinit_associate.c | 10 ++++------
wireless/wapi/src/driver_wext.c | 5 ++---
wireless/wapi/src/wapi.c | 3 +--
4 files changed, 10 insertions(+), 14 deletions(-)
diff --git a/include/wireless/wapi.h b/include/wireless/wapi.h
index 4f62596..8f487da 100644
--- a/include/wireless/wapi.h
+++ b/include/wireless/wapi.h
@@ -255,8 +255,8 @@ struct wpa_wconfig_s
uint8_t ssidlen; /* Length of the SSID */
uint8_t phraselen; /* Length of the passphrase */
FAR const char *ifname; /* E.g., "wlan0" */
- FAR const uint8_t *ssid; /* E.g., "myApSSID" */
- FAR const uint8_t *passphrase; /* E.g., "mySSIDpassphrase" */
+ FAR const char *ssid; /* E.g., "myApSSID" */
+ FAR const char *passphrase; /* E.g., "mySSIDpassphrase" */
};
/****************************************************************************
@@ -678,7 +678,7 @@ int wapi_scan_coll(int sock, FAR const char *ifname,
****************************************************************************/
int wpa_driver_wext_set_key_ext(int sockfd, FAR const char *ifname,
- enum wpa_alg_e alg, FAR const uint8_t *key,
+ enum wpa_alg_e alg, FAR const char *key,
size_t key_len);
/****************************************************************************
diff --git a/netutils/netinit/netinit_associate.c b/netutils/netinit/netinit_associate.c
index 42b19b6..0cf0251 100644
--- a/netutils/netinit/netinit_associate.c
+++ b/netutils/netinit/netinit_associate.c
@@ -59,8 +59,6 @@
int netinit_associate(FAR const char *ifname)
{
- static const char ssid[] = CONFIG_NETINIT_WAPI_SSID;
- static const char passphrase[] = CONFIG_NETINIT_WAPI_PASSPHRASE;
struct wpa_wconfig_s wconfig;
int ret;
@@ -70,12 +68,12 @@ int netinit_associate(FAR const char *ifname)
wconfig.auth_wpa = CONFIG_NETINIT_WAPI_AUTHWPA;
wconfig.cipher_mode = CONFIG_NETINIT_WAPI_CIPHERMODE;
wconfig.alg = CONFIG_NETINIT_WAPI_ALG;
+ wconfig.ssid = CONFIG_NETINIT_WAPI_SSID;
+ wconfig.passphrase = CONFIG_NETINIT_WAPI_PASSPHRASE;
wconfig.ifname = ifname;
- wconfig.ssid = (FAR const uint8_t *)ssid;
- wconfig.passphrase = (FAR const uint8_t *)passphrase;
- wconfig.ssidlen = strlen(ssid);
- wconfig.phraselen = strlen(passphrase);
+ wconfig.ssidlen = strlen(wconfig.ssid);
+ wconfig.phraselen = strlen(wconfig.passphrase);
/* Associate */
diff --git a/wireless/wapi/src/driver_wext.c b/wireless/wapi/src/driver_wext.c
index a3c86af..20e2b67 100644
--- a/wireless/wapi/src/driver_wext.c
+++ b/wireless/wapi/src/driver_wext.c
@@ -83,7 +83,7 @@
****************************************************************************/
int wpa_driver_wext_set_key_ext(int sockfd, FAR const char *ifname,
- enum wpa_alg_e alg, FAR const uint8_t *key,
+ enum wpa_alg_e alg, FAR const char *key,
size_t key_len)
{
struct iwreq iwr;
@@ -217,8 +217,7 @@ int wpa_driver_wext_associate(FAR struct wpa_wconfig_s *wconfig)
goto close_socket;
}
- ret = wapi_set_essid(sockfd, wconfig->ifname,
- (FAR const char *)wconfig->ssid, WAPI_ESSID_ON);
+ ret = wapi_set_essid(sockfd, wconfig->ifname, wconfig->ssid, WAPI_ESSID_ON);
if (ret < 0)
{
nerr("ERROR: Fail set ssid: %d\n", ret);
diff --git a/wireless/wapi/src/wapi.c b/wireless/wapi/src/wapi.c
index 0d656ba..2953fd2 100644
--- a/wireless/wapi/src/wapi.c
+++ b/wireless/wapi/src/wapi.c
@@ -535,8 +535,7 @@ static void wapi_psk_cmd(int sock, FAR const char *ifname,
/* Set the Passphrase */
ret = wpa_driver_wext_set_key_ext(sock, ifname, alg_flag,
- (FAR const uint8_t *)passphrase,
- strlen(passphrase));
+ passphrase, strlen(passphrase));
if (ret < 0)
{
WAPI_ERROR("ERROR: wpa_driver_wext_set_key_ext() failed: %d\n", ret);