mirror/lwip
1
0
Fork 0
mirror of https://github.com/lwip-tcpip/lwip.git synced 2025-04-09 21:44:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix warning about shadowing a global variable "index" in netifapi.c

Browse Source
This commit is contained in:
Dirk Ziegelmeier 2017-01-23 21:12:29 +01:00
parent 9e0b36747a
commit 0ef298b21f
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/api/netifapi.c
View File

@ -257,16 +257,16 @@ netifapi_netif_common(struct netif *netif, netifapi_void_fn voidfunc,
* tcpip_thread context. * tcpip_thread context.
* *
* @param name the interface name of the netif * @param name the interface name of the netif
* @param index output index of the found netif * @param idx output index of the found netif
*/ */
err_t err_t
netifapi_netif_name_to_index(const char *name, u8_t *index) netifapi_netif_name_to_index(const char *name, u8_t *idx)
{ {
err_t err; err_t err;
NETIFAPI_VAR_DECLARE(msg); NETIFAPI_VAR_DECLARE(msg);
NETIFAPI_VAR_ALLOC(msg); NETIFAPI_VAR_ALLOC(msg);
*index = 0; *idx = 0;
#if LWIP_MPU_COMPATIBLE #if LWIP_MPU_COMPATIBLE
strncpy(NETIFAPI_VAR_REF(msg).msg.ifs.name, name, IF_NAMESIZE - 1); strncpy(NETIFAPI_VAR_REF(msg).msg.ifs.name, name, IF_NAMESIZE - 1);
@ -276,7 +276,7 @@ netifapi_netif_name_to_index(const char *name, u8_t *index)
#endif /* LWIP_MPU_COMPATIBLE */ #endif /* LWIP_MPU_COMPATIBLE */
err = tcpip_api_call(netifapi_do_name_to_index, &API_VAR_REF(msg).call); err = tcpip_api_call(netifapi_do_name_to_index, &API_VAR_REF(msg).call);
if (!err) { if (!err) {
*index = NETIFAPI_VAR_REF(msg).msg.ifs.index; *idx = NETIFAPI_VAR_REF(msg).msg.ifs.index;
} }
NETIFAPI_VAR_FREE(msg); NETIFAPI_VAR_FREE(msg);
return err; return err;
@ -287,18 +287,18 @@ netifapi_netif_name_to_index(const char *name, u8_t *index)
* Call netif_index_to_name() in a thread-safe way by running that function inside the * Call netif_index_to_name() in a thread-safe way by running that function inside the
* tcpip_thread context. * tcpip_thread context.
* *
* @param index the interface index of the netif * @param idx the interface index of the netif
* @param name output name of the found netif, empty '\0' string if netif not found. * @param name output name of the found netif, empty '\0' string if netif not found.
* name should be of at least IF_NAMESIZE bytes * name should be of at least IF_NAMESIZE bytes
*/ */
err_t err_t
netifapi_netif_index_to_name(u8_t index, char *name) netifapi_netif_index_to_name(u8_t idx, char *name)
{ {
err_t err; err_t err;
NETIFAPI_VAR_DECLARE(msg); NETIFAPI_VAR_DECLARE(msg);
NETIFAPI_VAR_ALLOC(msg); NETIFAPI_VAR_ALLOC(msg);
NETIFAPI_VAR_REF(msg).msg.ifs.index = index; NETIFAPI_VAR_REF(msg).msg.ifs.index = idx;
#if !LWIP_MPU_COMPATIBLE #if !LWIP_MPU_COMPATIBLE
NETIFAPI_VAR_REF(msg).msg.ifs.name = name; NETIFAPI_VAR_REF(msg).msg.ifs.name = name;
#endif /* LWIP_MPU_COMPATIBLE */ #endif /* LWIP_MPU_COMPATIBLE */