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

serial_hid: address constness nits

This commit is contained in:
Gerhard Sittig 2019-06-18 18:57:44 +02:00 committed by Uwe Hermann
parent cb5cd1538f
commit 87307940f1
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/serial_hid.c
View File

@ -591,9 +591,9 @@ static int ser_hid_setup_funcs(struct sr_serial_dev_inst *serial)
* returns the chip index and advances the spec pointer upon match, * returns the chip index and advances the spec pointer upon match,
* returns SER_HID_CHIP_UNKNOWN upon mismatch. * returns SER_HID_CHIP_UNKNOWN upon mismatch.
*/ */
static enum ser_hid_chip_t ser_hid_chip_find_enum(char **spec_p) static enum ser_hid_chip_t ser_hid_chip_find_enum(const char **spec_p)
{ {
gchar *spec; const gchar *spec;
enum ser_hid_chip_t idx; enum ser_hid_chip_t idx;
struct ser_hid_chip_functions *desc; struct ser_hid_chip_functions *desc;
@ -774,7 +774,8 @@ static int ser_hid_parse_conn_spec(
serno = g_strdup(p); serno = g_strdup(p);
p += strlen(p); p += strlen(p);
} else if (!chip) { } else if (!chip) {
char *copy, *endptr; char *copy;
const char *endptr;
const char *name; const char *name;
copy = g_strdup(p); copy = g_strdup(p);
endptr = copy; endptr = copy;
@ -960,7 +961,7 @@ static int ser_hid_chip_search(enum ser_hid_chip_t *chip_ref,
sr_dbg("DBG: %s(), name %s", __func__, name); sr_dbg("DBG: %s(), name %s", __func__, name);
if (!name || !*name) if (!name || !*name)
return SR_ERR_NA; return SR_ERR_NA;
chip = ser_hid_chip_find_enum((char **)&name); chip = ser_hid_chip_find_enum(&name);
sr_dbg("DBG: %s(), chip %d", __func__, chip); sr_dbg("DBG: %s(), chip %d", __func__, chip);
if (chip == SER_HID_CHIP_UNKNOWN) if (chip == SER_HID_CHIP_UNKNOWN)
return SR_ERR_NA; return SR_ERR_NA;
@ -1058,7 +1059,7 @@ static int ser_hid_chip_search(enum ser_hid_chip_t *chip_ref,
sr_dbg("DBG: %s(), name %s", __func__, name); sr_dbg("DBG: %s(), name %s", __func__, name);
if (!name || !*name) if (!name || !*name)
return SR_ERR_NA; return SR_ERR_NA;
chip = ser_hid_chip_find_enum((char **)&name); chip = ser_hid_chip_find_enum(&name);
sr_dbg("DBG: %s(), chip %d", __func__, chip); sr_dbg("DBG: %s(), chip %d", __func__, chip);
if (chip == SER_HID_CHIP_UNKNOWN) if (chip == SER_HID_CHIP_UNKNOWN)
return SR_ERR_NA; return SR_ERR_NA;