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

Merge pull request #1293 from simonduq/pr/fix-warnings

Browse source 
Fix a number of compiler warnings and enable -Werror in Travis
This commit is contained in:
Simon Duquennoy 2015-11-10 08:49:11 +01:00
commit fbd78a7e3b
80 changed files with 201 additions and 146 deletions
Download patch file Download diff file Expand all files Collapse all files

5
regression-tests/12-rpl/code/receiver-node.c
View file

@ -92,7 +92,7 @@ set_global_address(void)
/*---------------------------------------------------------------------------*/
uint8_t should_blink = 1;
static void
route_callback(int event, uip_ipaddr_t *route, uip_ipaddr_t *ipaddr)
route_callback(int event, uip_ipaddr_t *route, uip_ipaddr_t *ipaddr, int num_routes)
{
if(event == UIP_DS6_NOTIFICATION_DEFRT_ADD) {
should_blink = 0;
@ -105,11 +105,10 @@ PROCESS_THREAD(receiver_node_process, ev, data)
{
static struct etimer et;
static struct uip_ds6_notification n;
uip_ipaddr_t *ipaddr;
PROCESS_BEGIN();
ipaddr = set_global_address();
set_global_address();
uip_ds6_notification_add(&n, route_callback);

2
regression-tests/21-large-rpl/code/node/project-conf.h
View file

@ -2,5 +2,7 @@
#define RESOLV_CONF_SUPPORTS_MDNS 0
#define COOJA_MTARCH_STACKSIZE 4096
#undef UIP_CONF_MAX_ROUTES
#define UIP_CONF_MAX_ROUTES 3
#undef NBR_TABLE_CONF_MAX_NEIGHBORS
#define NBR_TABLE_CONF_MAX_NEIGHBORS 3

2
regression-tests/21-large-rpl/code/router/project-conf.h
View file

@ -2,7 +2,9 @@
#define RESOLV_CONF_SUPPORTS_MDNS 0
#define COOJA_MTARCH_STACKSIZE 4096
#undef UIP_CONF_MAX_ROUTES
#define UIP_CONF_MAX_ROUTES 8
#undef NBR_TABLE_CONF_MAX_NEIGHBORS
#define NBR_TABLE_CONF_MAX_NEIGHBORS 8
/*#define RPL_CONF_DEFAULT_LIFETIME_UNIT 10

1
regression-tests/21-large-rpl/code/router/router.c
View file

@ -2,6 +2,7 @@
#include "contiki-net.h"
#include "ip64.h"
#include "net/netstack.h"
#include "net/rpl/rpl-dag-root.h"
/*---------------------------------------------------------------------------*/
PROCESS(router_node_process, "Router node");

2
regression-tests/Makefile.compile-test
View file

@ -41,7 +41,7 @@ define dooneexample
@echo Building example $(3): $(1) for target $(2)
@((cd $(EXAMPLESDIR)/$(1); \
export STM32W_CPUREV=CC; \
make TARGET=$(2) clean && make TARGET=$(2)) > \
make TARGET=$(2) clean && make TARGET=$(2) WERROR=1) > \
$(3)-$(subst /,-,$(1))$(2).report 2>&1 && \
(echo $(1) $(2): OK | tee $(3)-$(subst /,-,$(1))$(2).summary) || \
(echo $(1) $(2): FAIL ಠ.ಠ | tee $(3)-$(subst /,-,$(1))$(2).summary ; \