BLAHAJ
/
libsigrok
10
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

ols, pipistrello-ols: silence "assigned, not used" compiler warning 

Each code path either assigns to 'flags', or leaves the routine. There
is no potential path that leaves the variable at the initially assigned
value, so the assignment took no effect. Remove it.

Nit: Trim the source code line length while we are here.

This was reported by clang's scan-build.
This commit is contained in:
Gerhard Sittig 2018-02-09 19:23:31 +01:00 committed by Uwe Hermann
parent 8eadb70a37
commit b04cbd0ba3
2 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/hardware/openbench-logic-sniffer/api.c
View File

@ -265,7 +265,6 @@ static int config_set(uint32_t key, GVariant *data,
break; break;
case SR_CONF_PATTERN_MODE: case SR_CONF_PATTERN_MODE:
stropt = g_variant_get_string(data, NULL); stropt = g_variant_get_string(data, NULL);
flag = 0xffff;
if (!strcmp(stropt, STR_PATTERN_NONE)) { if (!strcmp(stropt, STR_PATTERN_NONE)) {
sr_info("Disabling test modes."); sr_info("Disabling test modes.");
flag = 0x0000; flag = 0x0000;
@ -278,10 +277,9 @@ static int config_set(uint32_t key, GVariant *data,
} else { } else {
return SR_ERR; return SR_ERR;
} }
if (flag != 0xffff) { devc->flag_reg &= ~FLAG_INTERNAL_TEST_MODE;
devc->flag_reg &= ~(FLAG_INTERNAL_TEST_MODE | FLAG_EXTERNAL_TEST_MODE); devc->flag_reg &= ~FLAG_EXTERNAL_TEST_MODE;
devc->flag_reg |= flag; devc->flag_reg |= flag;
}
break; break;
case SR_CONF_SWAP: case SR_CONF_SWAP:
if (g_variant_get_boolean(data)) { if (g_variant_get_boolean(data)) {

8
src/hardware/pipistrello-ols/api.c
View File

@ -276,7 +276,6 @@ static int config_set(uint32_t key, GVariant *data,
break; break;
case SR_CONF_PATTERN_MODE: case SR_CONF_PATTERN_MODE:
stropt = g_variant_get_string(data, NULL); stropt = g_variant_get_string(data, NULL);
flag = 0xffff;
if (!strcmp(stropt, STR_PATTERN_NONE)) { if (!strcmp(stropt, STR_PATTERN_NONE)) {
sr_info("Disabling test modes."); sr_info("Disabling test modes.");
flag = 0x0000; flag = 0x0000;
@ -289,10 +288,9 @@ static int config_set(uint32_t key, GVariant *data,
} else { } else {
return SR_ERR; return SR_ERR;
} }
if (flag != 0xffff) { devc->flag_reg &= ~FLAG_INTERNAL_TEST_MODE;
devc->flag_reg &= ~(FLAG_INTERNAL_TEST_MODE | FLAG_EXTERNAL_TEST_MODE); devc->flag_reg &= ~FLAG_EXTERNAL_TEST_MODE;
devc->flag_reg |= flag; devc->flag_reg |= flag;
}
break; break;
case SR_CONF_SWAP: case SR_CONF_SWAP:
if (g_variant_get_boolean(data)) { if (g_variant_get_boolean(data)) {