Merge pull request #550 from oliverschmidt/master

Avoid compiler warnings.

apps/webbrowser/www.c

@@ -456,7 +456,6 @@ quit(void)
 PROCESS_THREAD(www_process, ev, data)
 {
   static struct ctk_widget *w;
-  static unsigned char i;
 #if WWW_CONF_WITH_WGET
   static char *argptr;
 #endif /* WWW_CONF_WITH_WGET */

core/net/ip/resolv.c

@@ -774,7 +774,7 @@ check_entries(void)
 static void
 newdata(void)
 {
-  static uint8_t nquestions, nanswers, nauthrr;
+  static uint8_t nquestions, nanswers;
 
   static int8_t i;
 
@@ -863,6 +863,7 @@ newdata(void)
         }
         return;
       } else {
+        static uint8_t nauthrr;
         PRINTF("resolver: But we are still probing. Waiting...\n");
         /* We are still probing. We need to do the mDNS
          * probe race condition check here and make sure

core/net/ipv4/uip_arp.c

@@ -102,7 +102,6 @@ struct arp_entry {
 
 static const struct uip_eth_addr broadcast_ethaddr =
   {{0xff,0xff,0xff,0xff,0xff,0xff}};
-static const uint16_t broadcast_ipaddr[2] = {0xffff,0xffff};
 
 static struct arp_entry arp_table[UIP_ARPTAB_SIZE];
 static uip_ipaddr_t ipaddr;

core/net/ipv6/uip-icmp6.c

@@ -64,16 +64,17 @@
 #define UIP_EXT_BUF              ((struct uip_ext_hdr *)&uip_buf[uip_l2_l3_hdr_len])
 #define UIP_FIRST_EXT_BUF        ((struct uip_ext_hdr *)&uip_buf[UIP_LLIPH_LEN])
 
-/** \brief temporary IP address */
-static uip_ipaddr_t tmp_ipaddr;
-
 #if UIP_CONF_IPV6_RPL
 #include "rpl/rpl.h"
 #endif /* UIP_CONF_IPV6_RPL */
 
+#if UIP_CONF_IPV6
+
+/** \brief temporary IP address */
+static uip_ipaddr_t tmp_ipaddr;
+
 LIST(echo_reply_callback_list);
 
-#if UIP_CONF_IPV6
 /*---------------------------------------------------------------------------*/
 void
 uip_icmp6_echo_request_input(void)

cpu/6502/net/uip_arch.c

@@ -86,11 +86,9 @@ chksum(void) {
   asm("lda _chksum_ptr+1");
   asm("sta ptr1+1");
 
-
   asm("lda _chksum_len+1");
   asm("beq chksumlast");
 
-
   /* If checksum is > 256, do the first runs. */
   asm("ldy #0");
   asm("clc");
@@ -168,6 +166,8 @@ chksum(void) {
 
   asm("lda tmp1");
   asm("ldx tmp1+1");
+
+  return __AX__;
 }
 #pragma optimize(pop)
 /*-----------------------------------------------------------------------------------*/
@@ -251,7 +251,6 @@ transport_chksum(uint8_t protocol)
   asm("sta _chksum_tmp+1");
   asm("bcs tcpchksum_loop1");
 
-
   asm("lda _uip_aligned_buf+3+%b", UIP_LLH_LEN);
   asm("sec");
   asm("sbc #%b", UIP_IPH_LEN);
@@ -260,7 +259,6 @@ transport_chksum(uint8_t protocol)
   asm("sbc #0");
   asm("sta _chksum_len+1");
 
-  
   asm("ldy #$0c");
   asm("clc");
   asm("php");
@@ -287,7 +285,6 @@ transport_chksum(uint8_t protocol)
   asm("adc %v", chksum_protocol);  
   asm("sta _chksum_tmp+1");
 
-  
   asm("lda _chksum_tmp");
   asm("adc _chksum_len+1");
   asm("sta _chksum_tmp");
@@ -295,8 +292,6 @@ transport_chksum(uint8_t protocol)
   asm("adc _chksum_len");
   asm("sta _chksum_tmp+1");
 
-  
-
   asm("tcpchksum_loop3:");
   asm("lda _chksum_tmp");
   asm("adc #0");
@@ -306,7 +301,6 @@ transport_chksum(uint8_t protocol)
   asm("sta _chksum_tmp+1");
   asm("bcs tcpchksum_loop3");
 
-
   return chksum_tmp;
 }
 #pragma optimize(pop)
@@ -353,7 +347,6 @@ uip_tcpchksum(void)
   asm("sta _chksum_tmp+1");
   asm("bcs tcpchksum_loop1");
 
-
   asm("lda _uip_buf+3+%b", UIP_LLH_LEN);
   asm("sec");
   asm("sbc #%b", UIP_IPH_LEN);
@@ -362,7 +355,6 @@ uip_tcpchksum(void)
   asm("sbc #0");
   asm("sta _chksum_len+1");
 
-  
   asm("ldy #$0c");
   asm("clc");
   asm("php");
@@ -389,7 +381,6 @@ uip_tcpchksum(void)
   asm("adc #6");  /* IP_PROTO_TCP */
   asm("sta _chksum_tmp+1");
 
-  
   asm("lda _chksum_tmp");
   asm("adc _chksum_len+1");
   asm("sta _chksum_tmp");
@@ -397,8 +388,6 @@ uip_tcpchksum(void)
   asm("adc _chksum_len");
   asm("sta _chksum_tmp+1");
 
-  
-
   asm("tcpchksum_loop3:");
   asm("lda _chksum_tmp");
   asm("adc #0");
@@ -408,7 +397,6 @@ uip_tcpchksum(void)
   asm("sta _chksum_tmp+1");
   asm("bcs tcpchksum_loop3");
 
-
   return chksum_tmp;
 #endif 
 }
@@ -456,7 +444,6 @@ uip_udpchksum(void)
   asm("sta _chksum_tmp+1");
   asm("bcs tcpchksum_loop1");
 
-
   asm("lda _uip_buf+3+%b", UIP_LLH_LEN);
   asm("sec");
   asm("sbc #20");
@@ -465,7 +452,6 @@ uip_udpchksum(void)
   asm("sbc #0");
   asm("sta _chksum_len+1");
 
-  
   asm("ldy #$0c");
   asm("clc");
   asm("php");
@@ -492,7 +478,6 @@ uip_udpchksum(void)
   asm("adc #17");  /* IP_PROTO_UDP */
   asm("sta _chksum_tmp+1");
 
-  
   asm("lda _chksum_tmp");
   asm("adc _chksum_len+1");
   asm("sta _chksum_tmp");
@@ -500,8 +485,6 @@ uip_udpchksum(void)
   asm("adc _chksum_len");
   asm("sta _chksum_tmp+1");
 
-  
-
   asm("tcpchksum_loop3:");
   asm("lda _chksum_tmp");
   asm("adc #0");
@@ -511,7 +494,6 @@ uip_udpchksum(void)
   asm("sta _chksum_tmp+1");
   asm("bcs tcpchksum_loop3");
 
-
   return chksum_tmp;
 #endif
 }