From 8739113308e2d18f04f217af1ca8da7b87d7ce06 Mon Sep 17 00:00:00 2001 From: Arthur Fabre Date: Thu, 16 Jul 2015 13:42:25 +0100 Subject: [PATCH] Fix warnings in ContikiMAC MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ../..//core/net/mac/contikimac/contikimac.c:503:11: warning: variable ‘seqno’ set but not used [-Wunused-but-set-variable] ../..//core/net/mac/contikimac/contikimac.c:496:7: warning: variable ‘len’ set but not used [-Wunused-but-set-variable] Both of these variables are only used if RDC_CONF_HARDWARE_ACK is not true. Their definitions and use have been moved into #ifdef guards so they do not appear if RDC_CONF_HARDWARE_ACK is set. --- core/net/mac/contikimac/contikimac.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/core/net/mac/contikimac/contikimac.c b/core/net/mac/contikimac/contikimac.c index b7083e83d..927953681 100644 --- a/core/net/mac/contikimac/contikimac.c +++ b/core/net/mac/contikimac/contikimac.c @@ -493,14 +493,16 @@ send_packet(mac_callback_t mac_callback, void *mac_callback_ptr, #endif int strobes; uint8_t got_strobe_ack = 0; - int len; uint8_t is_broadcast = 0; uint8_t is_known_receiver = 0; uint8_t collisions; int transmit_len; int ret; uint8_t contikimac_was_on; +#if !RDC_CONF_HARDWARE_ACK + int len; uint8_t seqno; +#endif /* Exit if RDC and radio were explicitly turned off */ if(!contikimac_is_on && !contikimac_keep_radio_on) { @@ -641,11 +643,11 @@ send_packet(mac_callback_t mac_callback, void *mac_callback_ptr, or rx cycle */ on(); } + seqno = packetbuf_attr(PACKETBUF_ATTR_MAC_SEQNO); #endif watchdog_periodic(); t0 = RTIMER_NOW(); - seqno = packetbuf_attr(PACKETBUF_ATTR_MAC_SEQNO); for(strobes = 0, collisions = 0; got_strobe_ack == 0 && collisions == 0 && RTIMER_CLOCK_LT(RTIMER_NOW(), t0 + STROBE_TIME); strobes++) { @@ -658,7 +660,9 @@ send_packet(mac_callback_t mac_callback, void *mac_callback_ptr, break; } +#if !RDC_CONF_HARDWARE_ACK len = 0; +#endif { rtimer_clock_t wt;