From d103465a456ac87392afd42dbfebd3252ccbf2c6 Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Wed, 2 Jul 2014 16:04:25 -0600 Subject: NET: Rename uiplib/UIPLIB to netlib/NETLIB --- apps/nshlib/nsh_netcmds.c | 10 +++++----- apps/nshlib/nsh_netinit.c | 2 +- apps/nshlib/nsh_routecmds.c | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) (limited to 'apps/nshlib') diff --git a/apps/nshlib/nsh_netcmds.c b/apps/nshlib/nsh_netcmds.c index 53efb26e4..b05b547f7 100644 --- a/apps/nshlib/nsh_netcmds.c +++ b/apps/nshlib/nsh_netcmds.c @@ -69,18 +69,18 @@ #if defined(CONFIG_NET_ICMP) && defined(CONFIG_NET_ICMP_PING) && \ !defined(CONFIG_DISABLE_CLOCK) && !defined(CONFIG_DISABLE_SIGNALS) -# include +# include # include #endif #if defined(CONFIG_NET_UDP) && CONFIG_NFILE_DESCRIPTORS > 0 -# include +# include # include #endif #if defined(CONFIG_NET_TCP) && CONFIG_NFILE_DESCRIPTORS > 0 # ifndef CONFIG_NSH_DISABLE_WGET -# include +# include # include # endif #endif @@ -364,7 +364,7 @@ int tftpc_parseargs(FAR struct nsh_vtbl_s *vtbl, int argc, char **argv, break; case 'h': - if (!uiplib_ipaddrconv(optarg, (FAR unsigned char*)&args->ipaddr)) + if (!netlib_ipaddrconv(optarg, (FAR unsigned char*)&args->ipaddr)) { nsh_output(vtbl, g_fmtarginvalid, argv[0]); badarg = true; @@ -672,7 +672,7 @@ int cmd_ifconfig(FAR struct nsh_vtbl_s *vtbl, int argc, char **argv) { hw = argv[i+1]; i++; - badarg = !uiplib_hwmacconv(hw, mac); + badarg = !netlib_hwmacconv(hw, mac); } else { diff --git a/apps/nshlib/nsh_netinit.c b/apps/nshlib/nsh_netinit.c index 8461df7db..8c09319f8 100644 --- a/apps/nshlib/nsh_netinit.c +++ b/apps/nshlib/nsh_netinit.c @@ -46,7 +46,7 @@ #include -#include +#include #if defined(CONFIG_NSH_DHCPC) || defined(CONFIG_NSH_DNS) # include # include diff --git a/apps/nshlib/nsh_routecmds.c b/apps/nshlib/nsh_routecmds.c index 9e6c4fb14..5ca96a5f4 100644 --- a/apps/nshlib/nsh_routecmds.c +++ b/apps/nshlib/nsh_routecmds.c @@ -43,7 +43,7 @@ #include #include -#include +#include #include "nsh.h" #include "nsh_console.h" @@ -108,7 +108,7 @@ int cmd_addroute(FAR struct nsh_vtbl_s *vtbl, int argc, char **argv) /* We need to have a socket (any socket) in order to perform the ioctl */ - sockfd = socket(PF_INET, UIPLIB_SOCK_IOCTL, 0); + sockfd = socket(PF_INET, NETLIB_SOCK_IOCTL, 0); if (sockfd < 0) { nsh_output(vtbl, g_fmtcmdfailed, argv[0], "socket", NSH_ERRNO); @@ -236,7 +236,7 @@ int cmd_delroute(FAR struct nsh_vtbl_s *vtbl, int argc, char **argv) /* We need to have a socket (any socket) in order to perform the ioctl */ - sockfd = socket(PF_INET, UIPLIB_SOCK_IOCTL, 0); + sockfd = socket(PF_INET, NETLIB_SOCK_IOCTL, 0); if (sockfd < 0) { nsh_output(vtbl, g_fmtcmdfailed, argv[0], "socket", NSH_ERRNO); -- cgit v1.2.3