riot-ci/RIOT
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Reducing the scope of variable after running static code analyser.

Browse Source 
- Part of fix for issue number 480 (variableScope)
- Suppression of warnings that are not needed.
This commit is contained in:
kushalsingh007 2015-03-10 19:16:53 +05:30
parent 3540ff9a26
commit 3dbe4cd8af
3 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/cc110x/cc110x-rxtx.c
View File

@ -122,16 +122,18 @@ void cc110x_rx_handler(void *args)
static uint8_t receive_packet_variable(uint8_t *rxBuffer, radio_packet_length_t length) static uint8_t receive_packet_variable(uint8_t *rxBuffer, radio_packet_length_t length)
{ {
uint8_t status[2]; uint8_t status[2];
uint8_t packetLength = 0;
uint8_t crc_ok = 0;
/* Any bytes available in RX FIFO? */ /* Any bytes available in RX FIFO? */
if ((cc110x_read_status(CC1100_RXBYTES) & BYTES_IN_RXFIFO)) { if ((cc110x_read_status(CC1100_RXBYTES) & BYTES_IN_RXFIFO)) {
uint8_t packetLength = 0;
/* Read length byte (first byte in RX FIFO) */ /* Read length byte (first byte in RX FIFO) */
packetLength = cc110x_read_reg(CC1100_RXFIFO); packetLength = cc110x_read_reg(CC1100_RXFIFO);
/* Read data from RX FIFO and store in rxBuffer */ /* Read data from RX FIFO and store in rxBuffer */
if (packetLength <= length) { if (packetLength <= length) {
uint8_t crc_ok = 0;
/* Put length byte at first position in RX Buffer */ /* Put length byte at first position in RX Buffer */
rxBuffer[0] = packetLength; rxBuffer[0] = packetLength;

3
drivers/lis3dh/lis3dh.c
View File

@ -64,7 +64,6 @@ int lis3dh_init(lis3dh_t *dev, spi_t spi, gpio_t cs_pin, gpio_t int1_pin, gpio_t
int lis3dh_read_xyz(const lis3dh_t *dev, lis3dh_data_t *acc_data) int lis3dh_read_xyz(const lis3dh_t *dev, lis3dh_data_t *acc_data)
{ {
int32_t tmp;
uint8_t i; uint8_t i;
/* Set READ MULTIPLE mode */ /* Set READ MULTIPLE mode */
static const uint8_t addr = (LIS3DH_REG_OUT_X_L | LIS3DH_SPI_READ_MASK | LIS3DH_SPI_MULTI_MASK); static const uint8_t addr = (LIS3DH_REG_OUT_X_L | LIS3DH_SPI_READ_MASK | LIS3DH_SPI_MULTI_MASK);
@ -86,7 +85,7 @@ int lis3dh_read_xyz(const lis3dh_t *dev, lis3dh_data_t *acc_data)
/* Scale to milli-G */ /* Scale to milli-G */
for (i = 0; i < 3; ++i) { for (i = 0; i < 3; ++i) {
tmp = (int32_t)(((int16_t *)acc_data)[i]); int32_t tmp = (int32_t)(((int16_t *)acc_data)[i]);
tmp *= dev->scale; tmp *= dev->scale;
tmp /= 32768; tmp /= 32768;
(((int16_t *)acc_data)[i]) = (int16_t)tmp; (((int16_t *)acc_data)[i]) = (int16_t)tmp;

6
sys/net/routing/nhdp/nib_table.c
View File

@ -54,12 +54,12 @@ nib_entry_t *nib_process_hello(nhdp_addr_entry_t *nb_list, nhdp_addr_entry_t **o
{ {
nib_entry_t *nb_match = NULL; nib_entry_t *nb_match = NULL;
timex_t now; timex_t now;
uint8_t matches = 0;
mutex_lock(&mtx_nib_access); mutex_lock(&mtx_nib_access);
if (nb_list) { if (nb_list) {
nib_entry_t *nib_elt, *nib_tmp; nib_entry_t *nib_elt, *nib_tmp;
uint8_t matches = 0;
vtimer_now(&now); vtimer_now(&now);
@ -252,10 +252,10 @@ static void clear_nb_addresses(nib_entry_t *nib_entry, nhdp_addr_entry_t *nb_lis
nhdp_addr_entry_t **out_list, timex_t *now) nhdp_addr_entry_t **out_list, timex_t *now)
{ {
nhdp_addr_entry_t *elt, *nib_elt, *nib_tmp; nhdp_addr_entry_t *elt, *nib_elt, *nib_tmp;
uint8_t found;
LL_FOREACH_SAFE(nib_entry->address_list_head, nib_elt, nib_tmp) { LL_FOREACH_SAFE(nib_entry->address_list_head, nib_elt, nib_tmp) {
found = 0; uint8_t found = 0;
LL_FOREACH(nb_list, elt) { LL_FOREACH(nb_list, elt) {
/* Check whether address is still present in the new neighbor address list */ /* Check whether address is still present in the new neighbor address list */
if (nib_elt->address == elt->address) { if (nib_elt->address == elt->address) {