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

modbus: silence a build warning 

Refactor handling the size of modbus_devs, so it doesn't produce a build
warning and still allows the compiler to remove unused code.

This fixes bug #637. It could be reverted once modbus_devs
unconditionally has a member in the struct.

Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
This commit is contained in:
Wolfram Sang 2015-12-29 12:45:07 +01:00 committed by Uwe Hermann
parent 0a1f7b09b3
commit 52fb2d4484
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/modbus/modbus.c
View File

@ -33,6 +33,8 @@ static const struct sr_modbus_dev_inst *modbus_devs[] = {
#endif #endif
}; };
static const unsigned int modbus_devs_size = ARRAY_SIZE(modbus_devs);
static struct sr_dev_inst *sr_modbus_scan_resource(const char *resource, static struct sr_dev_inst *sr_modbus_scan_resource(const char *resource,
const char *serialcomm, int modbusaddr, const char *serialcomm, int modbusaddr,
struct sr_dev_inst *(*probe_device)(struct sr_modbus_dev_inst *modbus)) struct sr_dev_inst *(*probe_device)(struct sr_modbus_dev_inst *modbus))
@ -96,7 +98,7 @@ SR_PRIV GSList *sr_modbus_scan(struct drv_context *drvc, GSList *options,
} }
devices = NULL; devices = NULL;
for (i = 0; i < ARRAY_SIZE(modbus_devs); i++) { for (i = 0; i < modbus_devs_size; i++) {
if ((resource && strcmp(resource, modbus_devs[i]->prefix)) if ((resource && strcmp(resource, modbus_devs[i]->prefix))
|| !modbus_devs[i]->scan) || !modbus_devs[i]->scan)
continue; continue;
@ -144,7 +146,7 @@ SR_PRIV struct sr_modbus_dev_inst *modbus_dev_inst_new(const char *resource,
gchar **params; gchar **params;
unsigned int i; unsigned int i;
for (i = 0; i < ARRAY_SIZE(modbus_devs); i++) { for (i = 0; i < modbus_devs_size; i++) {
modbus_dev = modbus_devs[i]; modbus_dev = modbus_devs[i];
if (!strncmp(resource, modbus_dev->prefix, strlen(modbus_dev->prefix))) { if (!strncmp(resource, modbus_dev->prefix, strlen(modbus_dev->prefix))) {
sr_dbg("Opening %s device %s.", modbus_dev->name, resource); sr_dbg("Opening %s device %s.", modbus_dev->name, resource);