Peter M. Groen / libmodbus

Commit 074ba1535a2dbb62116f5365dbdeb1e0652990a6

Authored by Åke Forslund
Committed by Stéphane Raimbault
1 parent 5c9598fb

Remove warnings caused by shadowed 'index' variable 

The index variable shadowed a variable in the standard library causing
warnings. Renaming the 'index' variable to 'idx' resolves the issue.
Inline Side-by-side
Showing 2 changed files with 12 additions and 12 deletions
src/modbus-data.c
  View file @074ba15
@@ -59,25 +59,25 @@ static inline uint32_t bswap_32(uint32_t x) @@ -59,25 +59,25 @@ static inline uint32_t bswap_32(uint32_t x)
59 59
60 /* Sets many bits from a single byte value (all 8 bits of the byte value are 60 /* Sets many bits from a single byte value (all 8 bits of the byte value are
61 set) */ 61 set) */
62 -void modbus_set_bits_from_byte(uint8_t *dest, int index, const uint8_t value) 62 +void modbus_set_bits_from_byte(uint8_t *dest, int idx, const uint8_t value)
63 { 63 {
64 int i; 64 int i;
65 65
66 for (i=0; i < 8; i++) { 66 for (i=0; i < 8; i++) {
67 - dest[index+i] = (value & (1 << i)) ? 1 : 0; 67 + dest[idx+i] = (value & (1 << i)) ? 1 : 0;
68 } 68 }
69 } 69 }
70 70
71 -/* Sets many bits from a table of bytes (only the bits between index and  
72 - index + nb_bits are set) */  
73 -void modbus_set_bits_from_bytes(uint8_t *dest, int index, unsigned int nb_bits, 71 +/* Sets many bits from a table of bytes (only the bits between idx and
  72 + idx + nb_bits are set) */
  73 +void modbus_set_bits_from_bytes(uint8_t *dest, int idx, unsigned int nb_bits,
74 const uint8_t *tab_byte) 74 const uint8_t *tab_byte)
75 { 75 {
76 unsigned int i; 76 unsigned int i;
77 int shift = 0; 77 int shift = 0;
78 78
79 - for (i = index; i < index + nb_bits; i++) {  
80 - dest[i] = tab_byte[(i - index) / 8] & (1 << shift) ? 1 : 0; 79 + for (i = idx; i < idx + nb_bits; i++) {
  80 + dest[i] = tab_byte[(i - idx) / 8] & (1 << shift) ? 1 : 0;
81 /* gcc doesn't like: shift = (++shift) % 8; */ 81 /* gcc doesn't like: shift = (++shift) % 8; */
82 shift++; 82 shift++;
83 shift %= 8; 83 shift %= 8;
@@ -86,7 +86,7 @@ void modbus_set_bits_from_bytes(uint8_t *dest, int index, unsigned int nb_bits, @@ -86,7 +86,7 @@ void modbus_set_bits_from_bytes(uint8_t *dest, int index, unsigned int nb_bits,
86 86
87 /* Gets the byte value from many bits. 87 /* Gets the byte value from many bits.
88 To obtain a full byte, set nb_bits to 8. */ 88 To obtain a full byte, set nb_bits to 8. */
89 -uint8_t modbus_get_byte_from_bits(const uint8_t *src, int index, 89 +uint8_t modbus_get_byte_from_bits(const uint8_t *src, int idx,
90 unsigned int nb_bits) 90 unsigned int nb_bits)
91 { 91 {
92 unsigned int i; 92 unsigned int i;
@@ -99,7 +99,7 @@ uint8_t modbus_get_byte_from_bits(const uint8_t *src, int index, @@ -99,7 +99,7 @@ uint8_t modbus_get_byte_from_bits(const uint8_t *src, int index,
99 } 99 }
100 100
101 for (i=0; i < nb_bits; i++) { 101 for (i=0; i < nb_bits; i++) {
102 - value |= (src[index+i] << i); 102 + value |= (src[idx+i] << i);
103 } 103 }
104 104
105 return value; 105 return value;
src/modbus.h
  View file @074ba15
@@ -222,10 +222,10 @@ MODBUS_API int modbus_reply_exception(modbus_t *ctx, const uint8_t *req, @@ -222,10 +222,10 @@ MODBUS_API int modbus_reply_exception(modbus_t *ctx, const uint8_t *req,
222 tab_int8[(index) + 1] = (value) & 0xFF; \ 222 tab_int8[(index) + 1] = (value) & 0xFF; \
223 } while (0) 223 } while (0)
224 224
225 -MODBUS_API void modbus_set_bits_from_byte(uint8_t *dest, int index, const uint8_t value);  
226 -MODBUS_API void modbus_set_bits_from_bytes(uint8_t *dest, int index, unsigned int nb_bits, 225 +MODBUS_API void modbus_set_bits_from_byte(uint8_t *dest, int idx, const uint8_t value);
  226 +MODBUS_API void modbus_set_bits_from_bytes(uint8_t *dest, int idx, unsigned int nb_bits,
227 const uint8_t *tab_byte); 227 const uint8_t *tab_byte);
228 -MODBUS_API uint8_t modbus_get_byte_from_bits(const uint8_t *src, int index, unsigned int nb_bits); 228 +MODBUS_API uint8_t modbus_get_byte_from_bits(const uint8_t *src, int idx, unsigned int nb_bits);
229 MODBUS_API float modbus_get_float(const uint16_t *src); 229 MODBUS_API float modbus_get_float(const uint16_t *src);
230 MODBUS_API float modbus_get_float_dcba(const uint16_t *src); 230 MODBUS_API float modbus_get_float_dcba(const uint16_t *src);
231 MODBUS_API void modbus_set_float(float f, uint16_t *dest); 231 MODBUS_API void modbus_set_float(float f, uint16_t *dest);