sergiotarxz/nuttx-apps
sergiotarxz/nuttx-apps
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

wireless/wapi: correct check of return value

Browse Source 
1. correct check of return value
----------------------
 * Name: ioctl
...
 * Returned Value:
 *   >=0 on success (positive non-zero values are cmd-specific)
 *   -1 on failure with errno set properly:

2. country code length should contain LF

Signed-off-by: chao.an <anchao@xiaomi.com>
This commit is contained in:
chao.an 2022-06-24 19:03:12 +08:00 committed by Petro Karashchenko
parent ec4f97623a
commit 451f528bbb
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
wireless/wapi/src/wapi.c
View File

@ -403,7 +403,7 @@ static int wapi_show_cmd(int sock, int argc, FAR char **argv)
/* Get sensitivity */ /* Get sensitivity */
ret = wapi_get_sensitivity(sock, ifname, &sense); ret = wapi_get_sensitivity(sock, ifname, &sense);
if (ret == 0) if (ret >= 0)
{ {
printf(" Sense: %d\n", sense); printf(" Sense: %d\n", sense);
} }
@ -412,7 +412,7 @@ static int wapi_show_cmd(int sock, int argc, FAR char **argv)
memset(country, 0, sizeof(country)); memset(country, 0, sizeof(country));
ret = wapi_get_country(sock, ifname, country); ret = wapi_get_country(sock, ifname, country);
if (ret == 0) if (ret >= 0)
{ {
printf(" Country: %s\n", country); printf(" Country: %s\n", country);
} }
@ -834,7 +834,7 @@ static int wapi_country_cmd(int sock, int argc, FAR char **argv)
if (argc == 1) if (argc == 1)
{ {
ret = wapi_get_country(sock, argv[0], country); ret = wapi_get_country(sock, argv[0], country);
if (ret == 0) if (ret >= 0)
{ {
printf("%s\n", country); printf("%s\n", country);
} }
@ -862,7 +862,7 @@ static int wapi_sense_cmd(int sock, int argc, FAR char **argv)
int ret; int ret;
ret = wapi_get_sensitivity(sock, argv[0], &sense); ret = wapi_get_sensitivity(sock, argv[0], &sense);
if (ret == 0) if (ret >= 0)
{ {
printf("%d\n", sense); printf("%d\n", sense);
} }

2
wireless/wapi/src/wireless.c
View File

@ -1461,7 +1461,7 @@ int wapi_get_country(int sock, FAR const char *ifname,
strlcpy(wrq.ifr_name, ifname, IFNAMSIZ); strlcpy(wrq.ifr_name, ifname, IFNAMSIZ);
wrq.u.data.pointer = (FAR void *)country; wrq.u.data.pointer = (FAR void *)country;
wrq.u.data.length = 2; wrq.u.data.length = 3;
ret = ioctl(sock, SIOCGIWCOUNTRY, (unsigned long)((uintptr_t)&wrq)); ret = ioctl(sock, SIOCGIWCOUNTRY, (unsigned long)((uintptr_t)&wrq));
if (ret < 0) if (ret < 0)
{ {