diff --git a/boards/redbee-econotag/tools/ftditools/bbmc.c b/boards/redbee-econotag/tools/ftditools/bbmc.c index f211f52eee..00f6ef1533 100644 --- a/boards/redbee-econotag/tools/ftditools/bbmc.c +++ b/boards/redbee-econotag/tools/ftditools/bbmc.c @@ -474,9 +474,9 @@ int print_and_prompt(struct ftdi_device_list *devlist) if (input[last] == '\n') { input[last] = '\0'; } - } - sscanf(s, "%i", &sel); + sscanf(s, "%i", &sel); + } return sel; } diff --git a/sys/net/ccn_lite/ccnl-core.c b/sys/net/ccn_lite/ccnl-core.c index 7e13ccc820..5d1d33ca39 100644 --- a/sys/net/ccn_lite/ccnl-core.c +++ b/sys/net/ccn_lite/ccnl-core.c @@ -1467,12 +1467,13 @@ ccnl_core_RX(struct ccnl_relay_s *relay, int ifndx, unsigned char *data, DEBUGMSG(14, "ccnl_core_RX ifndx=%d, %d bytes\n", ifndx, datalen); from = ccnl_get_face_or_create(relay, ifndx, sender_id); - DEBUGMSG(1, "ccnl_core_RX: faceid=%d frag=%p\n", from->faceid, (void *) from->frag); if (!from) { return; } + DEBUGMSG(1, "ccnl_core_RX: faceid=%d frag=%p\n", from->faceid, (void *) from->frag); + ccnl_core_RX_datagram(relay, from, &data, &datalen); } diff --git a/sys/net/routing/rpl/rpl_dodag.c b/sys/net/routing/rpl/rpl_dodag.c index 253f494900..cad23b33ca 100644 --- a/sys/net/routing/rpl/rpl_dodag.c +++ b/sys/net/routing/rpl/rpl_dodag.c @@ -286,12 +286,15 @@ rpl_parent_t *rpl_find_preferred_parent(void) void rpl_parent_update(rpl_parent_t *parent) { rpl_dodag_t *my_dodag = rpl_get_my_dodag(); - uint16_t old_rank = my_dodag->my_rank; + uint16_t old_rank; if (my_dodag == NULL) { DEBUG("Not part of a dodag - this should not happen"); return; } + + old_rank = my_dodag->my_rank; + /* update Parent lifetime */ if (parent != NULL) { parent->lifetime = my_dodag->default_lifetime * my_dodag->lifetime_unit;