Merge pull request #797 from gebart/rpl-border-router-warnings

examples/rpl-border-router: Fix two minor warnings.
This commit is contained in:
Nicolas Tsiftes 2014-10-05 17:15:15 +02:00
commit 4cc1762851

View File

@ -143,7 +143,6 @@ ipaddr_add(const uip_ipaddr_t *addr)
static static
PT_THREAD(generate_routes(struct httpd_state *s)) PT_THREAD(generate_routes(struct httpd_state *s))
{ {
static int i;
static uip_ds6_route_t *r; static uip_ds6_route_t *r;
static uip_ds6_nbr_t *nbr; static uip_ds6_nbr_t *nbr;
#if BUF_USES_STACK #if BUF_USES_STACK
@ -247,7 +246,7 @@ PT_THREAD(generate_routes(struct httpd_state *s))
ADD("/%u (via ", r->length); ADD("/%u (via ", r->length);
ipaddr_add(uip_ds6_route_nexthop(r)); ipaddr_add(uip_ds6_route_nexthop(r));
if(1 || (r->state.lifetime < 600)) { if(1 || (r->state.lifetime < 600)) {
ADD(") %lus\n", r->state.lifetime); ADD(") %lus\n", (unsigned long)r->state.lifetime);
} else { } else {
ADD(")\n"); ADD(")\n");
} }