abc/lwip
1
0
Fork 0
mirror of https://git.savannah.nongnu.org/git/lwip.git synced 2026-05-18 22:26:41 +08:00
Code Issues Packages Projects Releases Wiki Activity

task #14314: include cleanups

Browse Source 
Couple of more cleanups for task #14314 involving includes:
  1) if.h name should match if_api.c due to LwIP convention and history.
     Standard if.h include can be used with compatibility header in
     posix/net/if.h
  2) API header (if.h) should not be included in core code. This include
     has been eliminated by moving the definition of IF_NAMESIZE to
     netif.h as NETIF_NAMESIZE.  This is now the canonical definition
     and IF_NAMESIZE just maps to it to provide the standard type
This commit is contained in:
Joel Cunningham
2017-02-03 16:45:29 -06:00
parent 3d80e51b2a
commit 4fb7d74165
7 changed files with 19 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/api/if_api.c
View File

@@ -40,7 +40,7 @@
#if LWIP_SOCKET
#include "lwip/if.h"
#include "lwip/if_api.h"
#include "lwip/netifapi.h"
char *

10
src/api/netifapi.c
View File

@@ -269,8 +269,8 @@ netifapi_netif_name_to_index(const char *name, u8_t *idx)
*idx = 0;
#if LWIP_MPU_COMPATIBLE
strncpy(NETIFAPI_VAR_REF(msg).msg.ifs.name, name, IF_NAMESIZE - 1);
NETIFAPI_VAR_REF(msg).msg.ifs.name[IF_NAMESIZE - 1] = '\0';
strncpy(NETIFAPI_VAR_REF(msg).msg.ifs.name, name, NETIF_NAMESIZE - 1);
NETIFAPI_VAR_REF(msg).msg.ifs.name[NETIF_NAMESIZE - 1] = '\0';
#else
NETIFAPI_VAR_REF(msg).msg.ifs.name = LWIP_CONST_CAST(char*, name);
#endif /* LWIP_MPU_COMPATIBLE */
@@ -289,7 +289,7 @@ netifapi_netif_name_to_index(const char *name, u8_t *idx)
*
* @param idx the interface index of the netif
* @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 NETIF_NAMESIZE bytes
*/
err_t
netifapi_netif_index_to_name(u8_t idx, char *name)
@@ -305,8 +305,8 @@ netifapi_netif_index_to_name(u8_t idx, char *name)
err = tcpip_api_call(netifapi_do_index_to_name, &API_VAR_REF(msg).call);
#if LWIP_MPU_COMPATIBLE
if (!err) {
strncpy(name, NETIFAPI_VAR_REF(msg).msg.ifs.name, IF_NAMESIZE - 1);
name[IF_NAMESIZE - 1] = '\0';
strncpy(name, NETIFAPI_VAR_REF(msg).msg.ifs.name, NETIF_NAMESIZE - 1);
name[NETIF_NAMESIZE - 1] = '\0';
}
#endif /* LWIP_MPU_COMPATIBLE */
NETIFAPI_VAR_FREE(msg);