mirror/lwip
1
0
Fork 0
mirror of https://github.com/lwip-tcpip/lwip.git synced 2024-09-17 20:24:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

slipif: fix several compiler warnings

Browse Source 
- include new SNMP header
- add missing pointer type casting
- add missing default cases
- use const for all ip address types
- distinguish between IPv4 and IPv6 address types

Signed-off-by: Stephan Linz <linz@li-pro.net>
This commit is contained in:
Stephan Linz 2016-01-18 09:27:07 +01:00 committed by Dirk Ziegelmeier
parent f2c7e9c939
commit 289d1dd7f3
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/netif/slipif.c
View File

@ -63,7 +63,7 @@
#include "lwip/def.h" #include "lwip/def.h"
#include "lwip/pbuf.h" #include "lwip/pbuf.h"
#include "lwip/stats.h" #include "lwip/stats.h"
#include "lwip/snmp_mib2.h" #include "lwip/snmp.h"
#include "lwip/sys.h" #include "lwip/sys.h"
#include "lwip/sio.h" #include "lwip/sio.h"
@ -87,7 +87,7 @@
enum slipif_recv_state { enum slipif_recv_state {
SLIP_RECV_NORMAL, SLIP_RECV_NORMAL,
SLIP_RECV_ESCAPE, SLIP_RECV_ESCAPE
}; };
struct slipif_priv { struct slipif_priv {
@ -123,7 +123,7 @@ slipif_output(struct netif *netif, struct pbuf *p)
LWIP_ASSERT("p != NULL", (p != NULL)); LWIP_ASSERT("p != NULL", (p != NULL));
LWIP_DEBUGF(SLIP_DEBUG, ("slipif_output(%"U16_F"): sending %"U16_F" bytes\n", (u16_t)netif->num, p->tot_len)); LWIP_DEBUGF(SLIP_DEBUG, ("slipif_output(%"U16_F"): sending %"U16_F" bytes\n", (u16_t)netif->num, p->tot_len));
priv = netif->state; priv = (struct slipif_priv *)netif->state;
/* Send pbuf out on the serial I/O device. */ /* Send pbuf out on the serial I/O device. */
/* Start with packet delimiter. */ /* Start with packet delimiter. */
@ -166,7 +166,7 @@ slipif_output(struct netif *netif, struct pbuf *p)
* @return always returns ERR_OK since the serial layer does not provide return values * @return always returns ERR_OK since the serial layer does not provide return values
*/ */
static err_t static err_t
slipif_output_v4(struct netif *netif, struct pbuf *p, ip_addr_t *ipaddr) slipif_output_v4(struct netif *netif, struct pbuf *p, const ip4_addr_t *ipaddr)
{ {
LWIP_UNUSED_ARG(ipaddr); LWIP_UNUSED_ARG(ipaddr);
return slipif_output(netif, p); return slipif_output(netif, p);
@ -184,7 +184,7 @@ slipif_output_v4(struct netif *netif, struct pbuf *p, ip_addr_t *ipaddr)
* @return always returns ERR_OK since the serial layer does not provide return values * @return always returns ERR_OK since the serial layer does not provide return values
*/ */
static err_t static err_t
slipif_output_v6(struct netif *netif, struct pbuf *p, ip6_addr_t *ipaddr) slipif_output_v6(struct netif *netif, struct pbuf *p, const ip6_addr_t *ipaddr)
{ {
LWIP_UNUSED_ARG(ipaddr); LWIP_UNUSED_ARG(ipaddr);
return slipif_output(netif, p); return slipif_output(netif, p);
@ -208,7 +208,7 @@ slipif_rxbyte(struct netif *netif, u8_t c)
LWIP_ASSERT("netif != NULL", (netif != NULL)); LWIP_ASSERT("netif != NULL", (netif != NULL));
LWIP_ASSERT("netif->state != NULL", (netif->state != NULL)); LWIP_ASSERT("netif->state != NULL", (netif->state != NULL));
priv = netif->state; priv = (struct slipif_priv *)netif->state;
switch (priv->state) { switch (priv->state) {
case SLIP_RECV_NORMAL: case SLIP_RECV_NORMAL:
@ -231,6 +231,8 @@ slipif_rxbyte(struct netif *netif, u8_t c)
case SLIP_ESC: case SLIP_ESC:
priv->state = SLIP_RECV_ESCAPE; priv->state = SLIP_RECV_ESCAPE;
return NULL; return NULL;
default:
break;
} /* end switch (c) */ } /* end switch (c) */
break; break;
case SLIP_RECV_ESCAPE: case SLIP_RECV_ESCAPE:
@ -243,9 +245,13 @@ slipif_rxbyte(struct netif *netif, u8_t c)
case SLIP_ESC_ESC: case SLIP_ESC_ESC:
c = SLIP_ESC; c = SLIP_ESC;
break; break;
default:
break;
} }
priv->state = SLIP_RECV_NORMAL; priv->state = SLIP_RECV_NORMAL;
break; break;
default:
break;
} /* end switch (priv->state) */ } /* end switch (priv->state) */
/* byte received, packet not yet completely received */ /* byte received, packet not yet completely received */