1
0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2025-01-17 04:52:59 +01:00

lint: fix redundantAssignment warnings

SQUASH ME: redundantAssignment (remove FAT stuff)

SQUASH ME: into redundantAssignment unnecessary supp
This commit is contained in:
Hinnerk van Bruinehsen 2014-10-16 12:30:09 +02:00
parent ec98c85a05
commit 4b68b9e547
5 changed files with 7 additions and 41 deletions

View File

@ -203,7 +203,7 @@ int main(int argc, char **argv)
while (1) {
/* Wait for CONNECT */
r = write(pfd, (const void *)"\0", 1);
write(pfd, (const void *)"\0", 1);
sleep(1);
r = read(pfd, &buf[i], sizeof(buf) - 1 - i);
@ -249,7 +249,7 @@ int main(int argc, char **argv)
s = sbuf.st_size;
printf("Sending %s (%i bytes)...\n", filename, s);
r = write(pfd, (const void *)&s, 4);
write(pfd, (const void *)&s, 4);
i = 0;
r = read(ffd, buf, 1);
@ -316,7 +316,7 @@ int main(int argc, char **argv)
s = sbuf.st_size;
printf("Sending %s (%i bytes)...\n", second, s);
r = write(pfd, (const void *)&s, 4);
write(pfd, (const void *)&s, 4);
i = 0;
r = read(sfd, buf, 1);
@ -345,7 +345,7 @@ int main(int argc, char **argv)
/* Send the remaining arguments */
if (args) {
printf("Sending %s\n", args);
r = write(pfd, (const void *)args, strlen(args));
write(pfd, (const void *)args, strlen(args));
r = write(pfd, (const void *)",", 1);
}

View File

@ -43,10 +43,6 @@
#define PRINTF(...)
#endif
#ifdef MODULE_FAT
#include "ff_ansi.h"
#endif
/**
* @name Heaps (defined in linker script)
* @{
@ -94,9 +90,6 @@ _off_t _lseek_r(struct _reent *r, int fd, _off_t pos, int whence)
PRINTF("lseek [%i] pos %li whence %i\n", fd, pos, whence);
r->_errno = ENODEV;
#ifdef MODULE_FAT
result = ff_lseek_r(r, fd, pos, whence);
#endif
PRINTF("lseek returned %li (0 is success)\n", result);
return result;
@ -111,9 +104,6 @@ int _open_r(struct _reent *r, const char *name, int mode)
PRINTF("open '%s' mode %#x\n", name, mode);
r->_errno = ENODEV; // no such device
#ifdef MODULE_FAT
ret = ff_open_r(r, name, mode);
#endif
PRINTF("open [%i] errno %i\n", ret, r->_errno);
return ret;
@ -127,9 +117,6 @@ int _stat_r(struct _reent *r, char *name, struct stat *st)
int ret = -1;
PRINTF("_stat_r '%s' \n", name);
r->_errno = ENODEV; // no such device
#ifdef MODULE_FAT
ret = ff_stat_r(r, name, st);
#endif
PRINTF("_stat_r [%i] errno %i\n", ret, r->_errno);
return ret;
}
@ -146,16 +133,7 @@ int _fstat_r(struct _reent *r, int fd, struct stat *st)
ret = 0;
}
else {
#ifdef MODULE_FAT
PRINTF("_fstat_r '%i' \n", fd);
ret = ff_fstat_r(r, fd, st);
PRINTF("_fstat_r [%i] errno %i\n", ret, r->_errno);
#else
r->_errno = ENODEV;
#endif
}
return ret;
@ -173,9 +151,6 @@ int _write_r(struct _reent *r, int fd, const void *data, unsigned int count)
break;
default:
#ifdef MODULE_FAT
result = ff_write_r(r, fd, data, count);
#endif
PRINTF("write [%i] data @%p count %i\n", fd, data, count);
PRINTF("write [%i] returned %i errno %i\n", fd, result, r->_errno);
@ -193,9 +168,6 @@ int _read_r(struct _reent *r, int fd, void *buffer, unsigned int count)
(void) count;
int result = -1;
r->_errno = EBADF;
#ifdef MODULE_FAT
result = ff_read_r(r, fd, buffer, count);
#endif
PRINTF("read [%i] buffer @%p count %i\n", fd, buffer, count);
PRINTF("read [%i] returned %i\n", fd, result);
@ -207,9 +179,6 @@ int _close_r(struct _reent *r, int fd)
(void) fd;
int result = -1;
r->_errno = EBADF;
#ifdef MODULE_FAT
ret = ff_close_r(r, fd);
#endif
PRINTF("close [%i]\n", fd);
PRINTF("close returned %i errno %i\n", result, errno);
@ -223,9 +192,6 @@ int _unlink_r(struct _reent *r, char *path)
int result = -1;
r->_errno = ENODEV;
#ifdef MODULE_FAT
result = ff_unlink_r(r, path);
#endif
PRINTF("unlink '%s'\n", path);
PRINTF("unlink returned %i errno %i\n", result, errno);

View File

@ -358,7 +358,7 @@ bool i2c_read(uint8_t i2c_interface, uint8_t slave_addr, uint8_t reg_addr,
I2C_BUFSIZE * sizeof(uint8_t));
i2c_write_length = 1;
i2c_read_length = rx_buff_length;
bool successful = false;
bool successful;
uint8_t readIndex = 3;
i2c_master_buffer[0] = (slave_addr << 1) & WRITE_ENABLE_BIT_MASK;
i2c_master_buffer[1] = reg_addr;

View File

@ -49,7 +49,7 @@ bool srf02_init(uint8_t i2c_interface, uint32_t baud_rate)
uint32_t srf02_get_distance(uint8_t ranging_mode)
{
bool status = false;
bool status;
uint8_t reg_size = 1;
uint8_t range_high_byte = 0;
uint8_t range_low_byte = 0;

View File

@ -81,7 +81,7 @@ uint8_t srf08_get_gain(void)
int32_t srf08_get_distances(uint32_t *range_array, uint8_t ranging_mode)
{
bool status = false;
bool status;
uint8_t reg_size = 1;
uint8_t rx_buff[reg_size];
uint8_t tx_buff[reg_size];