- struct sr_device *device, *d;
- struct sr_device_plugin *plugin;
- GSList *devices, *plugins, *l, *p;
- int num_devices, device_num, device_cnt;
+ struct sr_dev *dev, *d;
+ struct sr_dev_plugin *plugin;
+ GSList *devs, *plugins, *l, *p;
+ int num_devs, dev_num, dev_cnt;