FlapJackApps/libdc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix -Wshadow compiler warnings

Browse Source 
Rename a few variables, parameters and functions to avoid shadowing
others.
This commit is contained in:
Jef Driesen 2020-07-18 00:28:18 +02:00
parent 7c9726da64
commit 8f383ac531
5 changed files with 16 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/context.c
View File

@ -130,7 +130,7 @@ l_hexdump (char *str, size_t size, const unsigned char data[], size_t n)
} }
static void static void
logfunc (dc_context_t *context, dc_loglevel_t loglevel, const char *file, unsigned int line, const char *function, const char *msg, void *userdata) loghandler (dc_context_t *context, dc_loglevel_t loglevel, const char *file, unsigned int line, const char *function, const char *msg, void *userdata)
{ {
const char *loglevels[] = {"NONE", "ERROR", "WARNING", "INFO", "DEBUG", "ALL"}; const char *loglevels[] = {"NONE", "ERROR", "WARNING", "INFO", "DEBUG", "ALL"};
@ -166,7 +166,7 @@ dc_context_new (dc_context_t **out)
#ifdef ENABLE_LOGGING #ifdef ENABLE_LOGGING
context->loglevel = DC_LOGLEVEL_WARNING; context->loglevel = DC_LOGLEVEL_WARNING;
context->logfunc = logfunc; context->logfunc = loghandler;
#else #else
context->loglevel = DC_LOGLEVEL_NONE; context->loglevel = DC_LOGLEVEL_NONE;
context->logfunc = NULL; context->logfunc = NULL;

4
src/oceanic_vtpro.c
View File

@ -592,8 +592,8 @@ oceanic_vtpro_device_version (dc_device_t *abstract, unsigned char data[], unsig
return rc; return rc;
// Verify the checksum of the answer. // Verify the checksum of the answer.
unsigned char crc = answer[PAGESIZE / 2]; crc = answer[PAGESIZE / 2];
unsigned char ccrc = checksum_add_uint4 (answer, PAGESIZE / 2, 0x00); ccrc = checksum_add_uint4 (answer, PAGESIZE / 2, 0x00);
if (crc != ccrc) { if (crc != ccrc) {
ERROR (abstract->context, "Unexpected answer checksum."); ERROR (abstract->context, "Unexpected answer checksum.");
return DC_STATUS_PROTOCOL; return DC_STATUS_PROTOCOL;

4
src/reefnet_sensuspro_parser.c
View File

@ -163,8 +163,8 @@ reefnet_sensuspro_parser_get_field (dc_parser_t *abstract, dc_field_type_t type,
while (offset + sizeof (footer) <= size && while (offset + sizeof (footer) <= size &&
memcmp (data + offset, footer, sizeof (footer)) != 0) memcmp (data + offset, footer, sizeof (footer)) != 0)
{ {
unsigned int value = array_uint16_le (data + offset); unsigned int raw = array_uint16_le (data + offset);
unsigned int depth = (value & 0x01FF); unsigned int depth = (raw & 0x01FF);
if (depth > maxdepth) if (depth > maxdepth)
maxdepth = depth; maxdepth = depth;

13
src/suunto_eonsteel_parser.c
View File

@ -366,10 +366,10 @@ static int record_type(suunto_eonsteel_parser_t *eon, unsigned short type, const
return 0; return 0;
} }
static int traverse_entry(suunto_eonsteel_parser_t *eon, const unsigned char *p, int len, eon_data_cb_t callback, void *user) static int traverse_entry(suunto_eonsteel_parser_t *eon, const unsigned char *p, int size, eon_data_cb_t callback, void *user)
{ {
const unsigned char *name, *data, *end, *last, *one_past_end = p + len; const unsigned char *name, *data, *end, *last, *one_past_end = p + size;
int textlen, type; int textlen, id;
int rc; int rc;
// First two bytes: zero and text length // First two bytes: zero and text length
@ -388,7 +388,7 @@ static int traverse_entry(suunto_eonsteel_parser_t *eon, const unsigned char *p,
// Two bytes of 'type' followed by the name/descriptor, followed by the data // Two bytes of 'type' followed by the name/descriptor, followed by the data
data = name + textlen; data = name + textlen;
type = array_uint16_le(name); id = array_uint16_le(name);
name += 2; name += 2;
if (*name != '<') { if (*name != '<') {
@ -396,7 +396,7 @@ static int traverse_entry(suunto_eonsteel_parser_t *eon, const unsigned char *p,
return -1; return -1;
} }
record_type(eon, type, (const char *) name, textlen-3); record_type(eon, id, (const char *) name, textlen-3);
end = data; end = data;
last = data; last = data;
@ -982,8 +982,7 @@ static int traverse_samples(unsigned short type, const struct type_desc *desc, c
info->ceiling = 0.0; info->ceiling = 0.0;
for (i = 0; i < EON_MAX_GROUP; i++) { for (i = 0; i < EON_MAX_GROUP; i++) {
enum eon_sample type = desc->type[i]; int bytes = handle_sample_type(desc, info, desc->type[i], data);
int bytes = handle_sample_type(desc, info, type, data);
if (!bytes) if (!bytes)
break; break;

8
src/suunto_solution_parser.c
View File

@ -110,10 +110,10 @@ suunto_solution_parser_get_field (dc_parser_t *abstract, dc_field_type_t type, u
unsigned int depth = 0, maxdepth = 0; unsigned int depth = 0, maxdepth = 0;
unsigned int offset = 3; unsigned int offset = 3;
while (offset < size && data[offset] != 0x80) { while (offset < size && data[offset] != 0x80) {
unsigned char value = data[offset++]; unsigned char raw = data[offset++];
if (value < 0x7e || value > 0x82) { if (raw < 0x7e || raw > 0x82) {
depth += (signed char) value; depth += (signed char) raw;
if (value == 0x7D || value == 0x83) { if (raw == 0x7D || raw == 0x83) {
if (offset + 1 > size) if (offset + 1 > size)
return DC_STATUS_DATAFORMAT; return DC_STATUS_DATAFORMAT;
depth += (signed char) data[offset++]; depth += (signed char) data[offset++];