deac/osd-contiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fix compiler warnings

Browse source
This commit is contained in:
dak664 2010-12-14 22:45:22 +00:00
parent d8fe44645c
commit a026c94467
3 changed files with 12 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

4
apps/webserver/httpd.c
View file

@ -30,7 +30,7 @@
* *
* Author: Adam Dunkels <adam@sics.se> * Author: Adam Dunkels <adam@sics.se>
* *
* $Id: httpd.c,v 1.19 2010/10/19 18:29:03 adamdunkels Exp $ * $Id: httpd.c,v 1.20 2010/12/14 22:45:22 dak664 Exp $
*/ */
#include <stdio.h> #include <stdio.h>
@ -185,7 +185,7 @@ PT_THREAD(handle_script(struct httpd_state *s))
static static
PT_THREAD(send_headers(struct httpd_state *s, const char *statushdr)) PT_THREAD(send_headers(struct httpd_state *s, const char *statushdr))
{ {
const char *ptr; const char *ptr = NULL; //gcc warning if not initialized
PSOCK_BEGIN(&s->sout); PSOCK_BEGIN(&s->sout);

14
core/net/uip_arp.c
View file

@ -54,7 +54,7 @@
* *
* This file is part of the uIP TCP/IP stack. * This file is part of the uIP TCP/IP stack.
* *
* $Id: uip_arp.c,v 1.7 2010/10/24 22:29:39 adamdunkels Exp $ * $Id: uip_arp.c,v 1.8 2010/12/14 22:45:22 dak664 Exp $
* *
*/ */
@ -161,17 +161,19 @@ uip_arp_timer(void)
} }
} }
/*-----------------------------------------------------------------------------------*/ /*-----------------------------------------------------------------------------------*/
static void static void
uip_arp_update(uip_ipaddr_t *ipaddr, struct uip_eth_addr *ethaddr) uip_arp_update(uip_ipaddr_t *ipaddr, struct uip_eth_addr *ethaddr)
{ {
register struct arp_entry *tabptr; register struct arp_entry *tabptr = arp_table;
/* Walk through the ARP mapping table and try to find an entry to /* Walk through the ARP mapping table and try to find an entry to
update. If none is found, the IP -> MAC address mapping is update. If none is found, the IP -> MAC address mapping is
inserted in the ARP table. */ inserted in the ARP table. */
for(i = 0; i < UIP_ARPTAB_SIZE; ++i) { for(i = 0; i < UIP_ARPTAB_SIZE; ++i) {
tabptr = &arp_table[i]; tabptr = &arp_table[i];
/* Only check those entries that are actually in use. */ /* Only check those entries that are actually in use. */
if(!uip_ipaddr_cmp(&tabptr->ipaddr, &uip_all_zeroes_addr)) { if(!uip_ipaddr_cmp(&tabptr->ipaddr, &uip_all_zeroes_addr)) {
@ -186,6 +188,7 @@ uip_arp_update(uip_ipaddr_t *ipaddr, struct uip_eth_addr *ethaddr)
return; return;
} }
} }
tabptr++;
} }
/* If we get here, no existing ARP table entry was found, so we /* If we get here, no existing ARP table entry was found, so we
@ -362,7 +365,7 @@ uip_arp_arpin(void)
void void
uip_arp_out(void) uip_arp_out(void)
{ {
struct arp_entry *tabptr; struct arp_entry *tabptr = arp_table;
/* Find the destination IP address in the ARP table and construct /* Find the destination IP address in the ARP table and construct
the Ethernet header. If the destination IP addres isn't on the the Ethernet header. If the destination IP addres isn't on the
@ -393,12 +396,11 @@ uip_arp_out(void)
/* Else, we use the destination IP address. */ /* Else, we use the destination IP address. */
uip_ipaddr_copy(&ipaddr, &IPBUF->destipaddr); uip_ipaddr_copy(&ipaddr, &IPBUF->destipaddr);
} }
for(i = 0; i < UIP_ARPTAB_SIZE; ++i) { for(i = 0; i < UIP_ARPTAB_SIZE; ++i) {
tabptr = &arp_table[i];
if(uip_ipaddr_cmp(&ipaddr, &tabptr->ipaddr)) { if(uip_ipaddr_cmp(&ipaddr, &tabptr->ipaddr)) {
break; break;
} }
tabptr++;
} }
if(i == UIP_ARPTAB_SIZE) { if(i == UIP_ARPTAB_SIZE) {

4
core/net/uiplib.c
View file

@ -29,7 +29,7 @@
* *
* This file is part of the uIP TCP/IP stack and the Contiki operating system. * This file is part of the uIP TCP/IP stack and the Contiki operating system.
* *
* $Id: uiplib.c,v 1.2 2010/05/31 15:22:08 nifi Exp $ * $Id: uiplib.c,v 1.3 2010/12/14 22:45:22 dak664 Exp $
* *
*/ */
@ -48,7 +48,7 @@ uiplib_ipaddrconv(const char *addrstr, uip_ipaddr_t *ipaddr)
#if UIP_CONF_IPV6 #if UIP_CONF_IPV6
uint16_t value; uint16_t value;
int tmp, len, zero; int tmp, len, zero;
char c; char c = 0; //gcc warning if not initialized
value = 0; value = 0;
zero = -1; zero = -1;